Re: Is staging a port really this simple?

2014-05-27 Thread Matthew Seaman 
On 27/05/2014 04:37, Perry Hutchison wrote:
  post-install:
 - @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
 - || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
 - ${PREFIX}/etc/diskcheckd.conf
 + @${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
 + ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf

When converting a port to staging, you generally end up deleting
post-install targets like the above.  You only need
diskcheckd.conf.sample in the staging area (and hence in the generated
package).  It's the @sample business in pkg-plist (or the equivalent
@exec statements) which will perform this action when the package is
finally installed on your system.

Cheers,

Matthew

-- 
Dr Matthew J Seaman MA, D.Phil.

PGP: http://www.infracaninophile.co.uk/pgpkey
JID: matt...@infracaninophile.co.uk



signature.asc
Description: OpenPGP digital signature

Re: Is staging a port really this simple?

2014-05-27 Thread Baptiste Daroussin 
On Mon, May 26, 2014 at 08:37:13PM -0700, Perry Hutchison wrote:
 John Marino freebsd.cont...@marino.st wrote:
  You didn't miss much -- except adding the man page to the
  pkg-plist and removing the MAN* definitions from the makefile.
 
 ...
 
  On 5/25/2014 09:09, Zsolt Udvari wrote:
   Your condition is unneeded.
   You don't need check the existence of
   ${STAGEDIR}${PREFIX}/etc/distcheckd.conf because you'll copy it, the
   ${STAGEDIR} are empty
 
  no, the @sample keyword in pkg-plist does that (replacing other lines
  there).  pkg doesn't do this by itself, it needs to be told.
 
 So, like this? (diffs against the originals, not the previous iteration)
 [and I don't follow how, or if, @sample should be used in diskcheckd
 since it delivers the sample named as such, and also installs it as
 the live config file if the live config file does not already exist]
 
 --- misc/gtkfind/Makefile
 +++ misc/gtkfind/Makefile-staged
 @@ -18,15 +18,13 @@
  USE_GNOME=   gtk12
  GNU_CONFIGURE=   yes
  
 -MAN1=gtkfind.1
 -PLIST_FILES= bin/gtkfind
 +PLIST_FILES= bin/gtkfind man/man1/gtkfind.1
Manpages are automatically compressed so you are missing .gz here
  
 -NO_STAGE=yes
  post-patch:
   ${REINPLACE_CMD} -e s,-O2,${CFLAGS}, ${WRKSRC}/configure 
 ${WRKSRC}/Makefile.in
  
  do-install:
 - ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${PREFIX}/bin
 - ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${MANPREFIX}/man/man1
 + ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${STAGEDIR}${PREFIX}/bin
 + ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${STAGEDIR}${MANPREFIX}/man/man1
  
  .include bsd.port.mk
 --- sysutils/diskcheckd/Makefile
 +++ sysutils/diskcheckd/Makefile-staged
 @@ -11,15 +11,13 @@
  MAINTAINER=  per...@pluto.rain.com
  COMMENT= Daemon to check for disk read errors
  
 -MAN8=diskcheckd.8
  MLINKS=  diskcheckd.8 diskcheckd.conf.5
  
  USE_RC_SUBR= diskcheckd
  CFLAGS+= -D_PATH_CONF='\${PREFIX}/etc/diskcheckd.conf\'
  MAKEFILE=/usr/share/mk/bsd.prog.mk
 -MAKE_ARGS=   PROG=diskcheckd MAN8=${MAN8}
 +MAKE_ARGS=   PROG=diskcheckd MAN8=diskcheckd.8
  
 -NO_STAGE=yes
  do-extract:
   @${MKDIR} ${WRKSRC}
  .for f in diskcheckd.c diskcheckd.8
 @@ -30,13 +28,13 @@
   @${REINPLACE_CMD} -e 
 's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' 
 ${WRKSRC}/diskcheckd.8
  
  do-install:
 - ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
 - ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf 
 ${PREFIX}/etc/diskcheckd.conf.sample
 - ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${MAN8PREFIX}/man/man8
 + ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${STAGEDIR}${PREFIX}/sbin
 + ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf \
 + ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample
 + ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
  
  post-install:
 - @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
 - || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
 - ${PREFIX}/etc/diskcheckd.conf
 + @${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
 + ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf
  
  .include bsd.port.mk
 --- sysutils/diskcheckd/pkg-plist
 +++ sysutils/diskcheckd/pkg-plist-staged
 @@ -1,4 +1,6 @@
  sbin/diskcheckd
 +man/man8/diskcheckd.8
 +man/man5/diskcheckd.conf.5
.gz here as well 
  @unexec if cmp -s %D/etc/diskcheckd.conf.sample %D/etc/diskcheckd.conf; then 
 rm -f %D/etc/diskcheckd.conf; fi
  etc/diskcheckd.conf.sample
  @exec if [ ! -f %D/etc/diskcheckd.conf ]; then cp %D/%F %B/diskcheckd.conf; 
 fi


pgpI48Mk_BDPG.pgp
Description: PGP signature

Re: Is staging a port really this simple?

2014-05-26 Thread Perry Hutchison 
John Marino freebsd.cont...@marino.st wrote:
 You didn't miss much -- except adding the man page to the
 pkg-plist and removing the MAN* definitions from the makefile.

...

 On 5/25/2014 09:09, Zsolt Udvari wrote:
  Your condition is unneeded.
  You don't need check the existence of
  ${STAGEDIR}${PREFIX}/etc/distcheckd.conf because you'll copy it, the
  ${STAGEDIR} are empty

 no, the @sample keyword in pkg-plist does that (replacing other lines
 there).  pkg doesn't do this by itself, it needs to be told.

So, like this? (diffs against the originals, not the previous iteration)
[and I don't follow how, or if, @sample should be used in diskcheckd
since it delivers the sample named as such, and also installs it as
the live config file if the live config file does not already exist]

--- misc/gtkfind/Makefile
+++ misc/gtkfind/Makefile-staged
@@ -18,15 +18,13 @@
 USE_GNOME= gtk12
 GNU_CONFIGURE= yes
 
-MAN1=  gtkfind.1
-PLIST_FILES=   bin/gtkfind
+PLIST_FILES=   bin/gtkfind man/man1/gtkfind.1
 
-NO_STAGE=  yes
 post-patch:
${REINPLACE_CMD} -e s,-O2,${CFLAGS}, ${WRKSRC}/configure 
${WRKSRC}/Makefile.in
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${PREFIX}/bin
-   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${MANPREFIX}/man/man1
+   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${STAGEDIR}${PREFIX}/bin
+   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include bsd.port.mk
--- sysutils/diskcheckd/Makefile
+++ sysutils/diskcheckd/Makefile-staged
@@ -11,15 +11,13 @@
 MAINTAINER=per...@pluto.rain.com
 COMMENT=   Daemon to check for disk read errors
 
-MAN8=  diskcheckd.8
 MLINKS=diskcheckd.8 diskcheckd.conf.5
 
 USE_RC_SUBR=   diskcheckd
 CFLAGS+=   -D_PATH_CONF='\${PREFIX}/etc/diskcheckd.conf\'
 MAKEFILE=  /usr/share/mk/bsd.prog.mk
-MAKE_ARGS= PROG=diskcheckd MAN8=${MAN8}
+MAKE_ARGS= PROG=diskcheckd MAN8=diskcheckd.8
 
-NO_STAGE=  yes
 do-extract:
@${MKDIR} ${WRKSRC}
 .for f in diskcheckd.c diskcheckd.8
@@ -30,13 +28,13 @@
@${REINPLACE_CMD} -e 
's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' 
${WRKSRC}/diskcheckd.8
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
-   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf 
${PREFIX}/etc/diskcheckd.conf.sample
-   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${MAN8PREFIX}/man/man8
+   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${STAGEDIR}${PREFIX}/sbin
+   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf \
+   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample
+   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 post-install:
-   @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
-   || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
-   ${PREFIX}/etc/diskcheckd.conf
+   @${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
+   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf
 
 .include bsd.port.mk
--- sysutils/diskcheckd/pkg-plist
+++ sysutils/diskcheckd/pkg-plist-staged
@@ -1,4 +1,6 @@
 sbin/diskcheckd
+man/man8/diskcheckd.8
+man/man5/diskcheckd.conf.5
 @unexec if cmp -s %D/etc/diskcheckd.conf.sample %D/etc/diskcheckd.conf; then 
rm -f %D/etc/diskcheckd.conf; fi
 etc/diskcheckd.conf.sample
 @exec if [ ! -f %D/etc/diskcheckd.conf ]; then cp %D/%F %B/diskcheckd.conf; fi
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org

Re: Is staging a port really this simple?

2014-05-25 Thread John Marino 
On 5/25/2014 07:04, Perry Hutchison wrote:
 Some months ago, Baptiste Daroussin b...@freebsd.org wrote:
 
 ... if you need any help staging your ports I can provide reviews.
 
 I have a couple of ports that need staging support added, and I've
 finally managed to find time to look into it.  Having read such
 documentation as I could easily find using Google, and looked at
 the ports, I am feeling as if I must have overlooked something
 -- because the only changes that seem to be needed are to insert
 ${STAGEDIR} into a few lines in the Makefiles.
 
 Granted these are not complex ports, but if it really is this easy
 I have to wonder what all the uproar has been about :)
 
 What-all have I missed?
 

You didn't miss much -- except adding the man page to the pkg-plist and
removing the MAN* definitions from the makefile.

When the install target is defined, staging is normally pretty simple
to do.

John
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org

Re: Is staging a port really this simple?

2014-05-25 Thread Zsolt Udvari 
2014-05-25 7:04 GMT+02:00 Perry Hutchison per...@pluto.rain.com:
  post-install:
 -   @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
 -   || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
 -   ${PREFIX}/etc/diskcheckd.conf
 +   @[ -f ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf ] \
 +   || ${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
 +   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf
Your condition is unneeded.
You don't need check the existence of
${STAGEDIR}${PREFIX}/etc/distcheckd.conf because you'll copy it, the
${STAGEDIR} are empty
The reason of old check was: shouldn't overwrite the existing
distcheckd.conf (in system, not STAGEDIR). These checks are
unnecessary, the 'pkg' does it.

Cheers,
  Zsolt
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org

Re: Is staging a port really this simple?

2014-05-25 Thread John Marino 
On 5/25/2014 09:09, Zsolt Udvari wrote:
 2014-05-25 7:04 GMT+02:00 Perry Hutchison per...@pluto.rain.com:
  post-install:
 -   @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
 -   || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
 -   ${PREFIX}/etc/diskcheckd.conf
 +   @[ -f ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf ] \
 +   || ${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
 +   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf
 Your condition is unneeded.
 You don't need check the existence of
 ${STAGEDIR}${PREFIX}/etc/distcheckd.conf because you'll copy it, the
 ${STAGEDIR} are empty
 The reason of old check was: shouldn't overwrite the existing
 distcheckd.conf (in system, not STAGEDIR). These checks are
 unnecessary, the 'pkg' does it.
 


no, the @sample keyword in pkg-plist does that (replacing other lines
there).  pkg doesn't do this by itself, it needs to be told.

John
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org

Re: Is staging a port really this simple?

2014-05-25 Thread Zsolt Udvari 
2014-05-25 9:12 GMT+02:00 John Marino freebsd.cont...@marino.st:
 no, the @sample keyword in pkg-plist does that (replacing other lines
 there).  pkg doesn't do this by itself, it needs to be told.
Yes, this is more accurate.
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org

Re: Is staging a port really this simple?

2014-05-25 Thread Fbsd8 

Perry Hutchison wrote:

Some months ago, Baptiste Daroussin b...@freebsd.org wrote:


... if you need any help staging your ports I can provide reviews.


I have a couple of ports that need staging support added, and I've
finally managed to find time to look into it.  Having read such
documentation as I could easily find using Google, and looked at
the ports, I am feeling as if I must have overlooked something
-- because the only changes that seem to be needed are to insert
${STAGEDIR} into a few lines in the Makefiles.

Granted these are not complex ports, but if it really is this easy
I have to wonder what all the uproar has been about :)

What-all have I missed?

--- misc/gtkfind/Makefile
+++ misc/gtkfind/Makefile-staged
@@ -26,7 +26,7 @@
${REINPLACE_CMD} -e s,-O2,${CFLAGS}, ${WRKSRC}/configure 
${WRKSRC}/Makefile.in
 
 do-install:

-   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${PREFIX}/bin
-   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${MANPREFIX}/man/man1
+   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${STAGEDIR}${PREFIX}/bin
+   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include bsd.port.mk

--- sysutils/diskcheckd/Makefile
+++ sysutils/diskcheckd/Makefile-staged
@@ -19,7 +19,6 @@
 MAKEFILE=  /usr/share/mk/bsd.prog.mk
 MAKE_ARGS= PROG=diskcheckd MAN8=${MAN8}
 
-NO_STAGE=	yes

 do-extract:
@${MKDIR} ${WRKSRC}
 .for f in diskcheckd.c diskcheckd.8
@@ -30,13 +29,14 @@
@${REINPLACE_CMD} -e 
's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' 
${WRKSRC}/diskcheckd.8
 
 do-install:

-   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
-   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf 
${PREFIX}/etc/diskcheckd.conf.sample
-   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${MAN8PREFIX}/man/man8
+   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${STAGEDIR}${PREFIX}/sbin
+   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf \
+   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample
+   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 post-install:

-   @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
-   || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
-   ${PREFIX}/etc/diskcheckd.conf
+   @[ -f ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf ] \
+   || ${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
+   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf
 
 .include bsd.port.mk




Other things to do is pkg install portlint porttools
then from the ports tree location do
portlint -a
port test
make stage
make check-plist
make install clean
make deinstall

___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org

Re: Is staging a port really this simple?

2014-05-25 Thread Michael Gmelin 
On Sun, 25 May 2014 04:14:42 -0400
Fbsd8 fb...@a1poweruser.com wrote:

 Perry Hutchison wrote:
  Some months ago, Baptiste Daroussin b...@freebsd.org wrote:
  
  ... if you need any help staging your ports I can provide reviews.
  
  I have a couple of ports that need staging support added, and I've
  finally managed to find time to look into it.  Having read such
  documentation as I could easily find using Google, and looked at
  the ports, I am feeling as if I must have overlooked something
  -- because the only changes that seem to be needed are to insert
  ${STAGEDIR} into a few lines in the Makefiles.
  
  Granted these are not complex ports, but if it really is this easy
  I have to wonder what all the uproar has been about :)
  
  What-all have I missed?
  
  --- misc/gtkfind/Makefile
  +++ misc/gtkfind/Makefile-staged
  @@ -26,7 +26,7 @@
  ${REINPLACE_CMD} -e s,-O2,${CFLAGS}, ${WRKSRC}/configure
  ${WRKSRC}/Makefile.in 
   do-install:
  -   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${PREFIX}/bin
  -   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${MANPREFIX}/man/man1
  +   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind
  ${STAGEDIR}${PREFIX}/bin
  +   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1
  ${STAGEDIR}${MANPREFIX}/man/man1 
   .include bsd.port.mk
  --- sysutils/diskcheckd/Makefile
  +++ sysutils/diskcheckd/Makefile-staged
  @@ -19,7 +19,6 @@
   MAKEFILE=  /usr/share/mk/bsd.prog.mk
   MAKE_ARGS= PROG=diskcheckd MAN8=${MAN8}
   
  -NO_STAGE=  yes
   do-extract:
  @${MKDIR} ${WRKSRC}
   .for f in diskcheckd.c diskcheckd.8
  @@ -30,13 +29,14 @@
  @${REINPLACE_CMD} -e
  's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g'
  ${WRKSRC}/diskcheckd.8 do-install:
  -   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
  -   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf
  ${PREFIX}/etc/diskcheckd.conf.sample
  -   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8
  ${MAN8PREFIX}/man/man8
  +   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd
  ${STAGEDIR}${PREFIX}/sbin
  +   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf \
  +
  ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample
  +   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8
  ${STAGEDIR}${MAN8PREFIX}/man/man8 
   post-install:
  -   @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
  -   || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
  -   ${PREFIX}/etc/diskcheckd.conf
  +   @[ -f ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf ] \
  +   || ${CP} -p
  ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
  +   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf
   
   .include bsd.port.mk
 
 
 
 Other things to do is pkg install portlint porttools
 then from the ports tree location do
 portlint -a
 port test
 make stage
 make check-plist

make check-orphans
make stage-qa

 make install clean
 make deinstall
 







-- 
Michael Gmelin
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org

Is staging a port really this simple?

2014-05-24 Thread Perry Hutchison 
Some months ago, Baptiste Daroussin b...@freebsd.org wrote:

 ... if you need any help staging your ports I can provide reviews.

I have a couple of ports that need staging support added, and I've
finally managed to find time to look into it.  Having read such
documentation as I could easily find using Google, and looked at
the ports, I am feeling as if I must have overlooked something
-- because the only changes that seem to be needed are to insert
${STAGEDIR} into a few lines in the Makefiles.

Granted these are not complex ports, but if it really is this easy
I have to wonder what all the uproar has been about :)

What-all have I missed?

--- misc/gtkfind/Makefile
+++ misc/gtkfind/Makefile-staged
@@ -26,7 +26,7 @@
${REINPLACE_CMD} -e s,-O2,${CFLAGS}, ${WRKSRC}/configure 
${WRKSRC}/Makefile.in
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${PREFIX}/bin
-   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${MANPREFIX}/man/man1
+   ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${STAGEDIR}${PREFIX}/bin
+   ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include bsd.port.mk
--- sysutils/diskcheckd/Makefile
+++ sysutils/diskcheckd/Makefile-staged
@@ -19,7 +19,6 @@
 MAKEFILE=  /usr/share/mk/bsd.prog.mk
 MAKE_ARGS= PROG=diskcheckd MAN8=${MAN8}
 
-NO_STAGE=  yes
 do-extract:
@${MKDIR} ${WRKSRC}
 .for f in diskcheckd.c diskcheckd.8
@@ -30,13 +29,14 @@
@${REINPLACE_CMD} -e 
's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' 
${WRKSRC}/diskcheckd.8
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
-   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf 
${PREFIX}/etc/diskcheckd.conf.sample
-   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${MAN8PREFIX}/man/man8
+   ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${STAGEDIR}${PREFIX}/sbin
+   ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf \
+   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample
+   ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 post-install:
-   @[ -f ${PREFIX}/etc/diskcheckd.conf ] \
-   || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \
-   ${PREFIX}/etc/diskcheckd.conf
+   @[ -f ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf ] \
+   || ${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \
+   ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf
 
 .include bsd.port.mk
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org