6 files changed, 43 insertions, 23 deletions

diff --git a/sysutils/curly/Makefile b/sysutils/curly/Makefile
index 4b9a685e4591..0f3795171935 100644
--- a/sysutils/curly/Makefile
+++ b/sysutils/curly/Makefile
@@ -19,10 +19,7 @@ BUILD_DEPENDS=	makeme:${PORTSDIR}/devel/msrc0 \
 
 MAKE_FLAGS=
 MAKEFILE=
-MAN1=		${PORTNAME}.1
-MLINKS=		${PORTNAME}.1 un${PORTNAME}.1
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,CFLAGS=,CFLAGS+=,' -e 's,^DEBUG,#DEBUG,'\
 		-e 's,gcc,${CC},' ${WRKSRC}/bin/curly/Make.host
@@ -35,6 +32,7 @@ do-install:
 	( cd ${WRKSRC}/bin/curly && ${SETENV} ${MAKENV} makeme \
 	    ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} )
 	${INSTALL_MAN} ${WRKSRC}/bin/${PORTNAME}/${PORTNAME}.man \
-	    ${PREFIX}/man/man1/${PORTNAME}.1
+	    ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1
+	${LN} -s ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/un${PORTNAME}.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/curly/pkg-plist b/sysutils/curly/pkg-plist
index 05c0f2ef3a2e..d1f8d846c5b7 100644
--- a/sysutils/curly/pkg-plist
+++ b/sysutils/curly/pkg-plist
@@ -1,2 +1,4 @@
 bin/curly
 bin/uncurly
+man/man1/curly.1.gz
+man/man1/uncurly.1.gz
diff --git a/sysutils/doinkd/Makefile b/sysutils/doinkd/Makefile
index e7558a87a687..7d2d088d39e3 100644
--- a/sysutils/doinkd/Makefile
+++ b/sysutils/doinkd/Makefile
@@ -10,25 +10,19 @@ MASTER_SITES=	SF/idled/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A daemon that logs out idle users and those users hogging resources
 
-MANCOMPRESSED=	yes
-MAN5=		doinkd.cf.5
-MAN8=		doinkd.8
-
 USE_RC_SUBR=	${PORTNAME}
 
-PLIST_FILES=	etc/doinkd/doinkd.cf.template sbin/doinkd
-PLIST_DIRSTRY=	etc/doinkd
+MAKE_ARGS=	STAGEDIR=${STAGEDIR}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-extract:
 	(cd ${WRKSRC}; make clean)
 
 pre-install:
-	${MKDIR} ${PREFIX}/etc/doinkd
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/doinkd
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/sbin/doinkd
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/doinkd
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/doinkd/files/patch-Makefile b/sysutils/doinkd/files/patch-Makefile
index 962dae9ca0aa..28faa938c598 100644
--- a/sysutils/doinkd/files/patch-Makefile
+++ b/sysutils/doinkd/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- Makefile.orig	2006-05-30 00:19:28.000000000 -0700
-+++ Makefile	2010-08-27 12:42:08.661284827 -0700
++++ Makefile	2014-06-03 18:33:50.171999588 -0700
 @@ -2,8 +2,8 @@
  #
  
@@ -20,7 +20,7 @@
  SPECLIBS = 
  INSTTYPE = install4
  
-@@ -193,26 +193,26 @@
+@@ -193,26 +193,27 @@
  # You will need to delete parse.c before compiling!  You can either
  # do so by hand, or do a 'make clean' followed by the normal 'make'.
  #DEFS += -O -m486
@@ -35,9 +35,10 @@
 -#CFDEST  = /etc/doinkd
 -#MDEST   = /usr/local/man
 -#LOGDEST = /var/log
-+DEST    = ${PREFIX}/sbin
-+CFDEST  = ${PREFIX}/etc/doinkd
-+MDEST   = ${PREFIX}/man
++DEST    = ${STAGEDIR}${PREFIX}/sbin
++CFDEST  = ${STAGEDIR}${PREFIX}/etc/doinkd
++CFDEST_REAL  = ${PREFIX}/etc/doinkd
++MDEST   = ${STAGEDIR}${PREFIX}/man
 +LOGDEST = /var/log
  #
  #OWNER   = root
@@ -59,3 +60,28 @@
  
  ######################################################################
  ######################################################################
+@@ -450,7 +451,7 @@
+ PMAN    = doinkd.8
+ 
+ # Names of config and log files
+-CONFIG  = ${CFDEST}/${COMMFILE}
++CONFIG  = ${CFDEST_REAL}/${COMMFILE}
+ LOGFILE = ${LOGDEST}/doinkd.log
+ 
+ # HERE are the big CFLAGS
+@@ -509,11 +510,11 @@
+ # BSD like, but with some enhancements like: install -s -> strip binary
+ #                                            gzip manual pages
+ install1a: all
+-	install -s -c -m ${MODE} -o ${OWNER} -g ${GROUP} ${BINARY} ${DEST}
+-	install -c -m ${CFMODE} -o ${CFOWNER} -g ${CFGROUP} ${COMMFILE}.template ${CFDEST}
+-	install -c -m ${MMODE} -o ${MOWNER} ${CFMAN} ${MDEST}/man5
++	install -s -c -m ${MODE} ${BINARY} ${DEST}
++	install -c -m ${CFMODE} ${COMMFILE}.template ${CFDEST}
++	install -c -m ${MMODE} ${CFMAN} ${MDEST}/man5
+ 	gzip -f ${MDEST}/man5/${CFMAN}
+-	install -c -m ${MMODE} -o ${MOWNER} ${PMAN} ${MDEST}/man8
++	install -c -m ${MMODE} ${PMAN} ${MDEST}/man8
+ 	gzip -f ${MDEST}/man8/${PMAN}
+ 	@echo ""
+ 	@echo "Be sure to edit/create the file ${CONFIG} based on"
diff --git a/sysutils/zetaback/Makefile b/sysutils/zetaback/Makefile
index 141da1ebe1d7..6905cf32a69a 100644
--- a/sysutils/zetaback/Makefile
+++ b/sysutils/zetaback/Makefile
@@ -15,11 +15,8 @@ USE_PERL5=	run
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
 
-MAN1=		zetaback.1 zetaback_agent.1
-
-NO_STAGE=	yes
 post-install:
-	@${TEST} ! -f ${PREFIX}/etc/zetaback.conf && ${CP} ${PREFIX}/etc/zetaback.conf.sample ${PREFIX}/etc/zetaback.conf; ${TRUE}
-	@${TEST} ! -f ${PREFIX}/etc/zetaback_agent.conf && ${CP} ${PREFIX}/etc/zetaback_agent.conf.sample ${PREFIX}/etc/zetaback_agent.conf; ${TRUE}
+	@${TEST} ! -f ${PREFIX}/etc/zetaback.conf && ${CP} ${STAGEDIR}${PREFIX}/etc/zetaback.conf.sample ${STAGEDIR}${PREFIX}/etc/zetaback.conf; ${TRUE}
+	@${TEST} ! -f ${PREFIX}/etc/zetaback_agent.conf && ${CP} ${STAGEDIR}${PREFIX}/etc/zetaback_agent.conf.sample ${STAGEDIR}${PREFIX}/etc/zetaback_agent.conf; ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/zetaback/pkg-plist b/sysutils/zetaback/pkg-plist
index cedd2d695ea1..60ac3fc9cadc 100644
--- a/sysutils/zetaback/pkg-plist
+++ b/sysutils/zetaback/pkg-plist
@@ -4,3 +4,6 @@ bin/zetaback
 bin/zetaback_agent
 etc/zetaback.conf.sample
 etc/zetaback_agent.conf.sample
+man/man1/zetaback.1.gz
+man/man1/zetaback_agent.1.gz
+