2 files changed, 34 insertions, 37 deletions

diff --git a/irc/eggdrop-devel/Makefile b/irc/eggdrop-devel/Makefile
index 1041d7eeb2c0..416247b04e2f 100644
--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@@ -24,14 +24,11 @@ GH_TAGNAME=	${GH_COMMIT}
 
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		eggdrop.1
-
 SUB_FILES=	pkg-message
 
 CONFLICTS=	eggdrop-[0-9]*
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
@@ -41,16 +38,16 @@ post-configure:
 	@(cd ${WRKSRC}; ${MAKE} config)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.sample ${PREFIX}/etc
-	@${MKDIR} ${PREFIX}/lib/eggdrop
+	${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.sample ${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/eggdrop
 .for f in assoc.so blowfish.so channels.so compress.so console.so ctcp.so \
 	dns.so filesys.so irc.so notes.so seen.so server.so share.so \
 	transfer.so uptime.so
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/eggdrop
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib/eggdrop
 .endfor
-	@${MKDIR} ${DATADIR}/help
+	@${MKDIR} ${STAGEDIR}${DATADIR}/help
 .for f in assoc.mod/help/assoc.help channels.mod/help/chaninfo.help \
 	channels.mod/help/channels.help console.mod/help/console.help \
 	compress.mod/help/compress.help ctcp.mod/help/ctcp.help \
@@ -58,65 +55,64 @@ do-install:
 	notes.mod/help/notes.help seen.mod/help/seen.help \
 	server.mod/help/server.help share.mod/help/share.help \
 	transfer.mod/help/transfer.help uptime.mod/help/uptime.help
-	${INSTALL_DATA} ${WRKSRC}/src/mod/${f} ${DATADIR}/help
+	${INSTALL_DATA} ${WRKSRC}/src/mod/${f} ${STAGEDIR}${DATADIR}/help
 .endfor
-	@${MKDIR} ${DATADIR}/help/set
+	@${MKDIR} ${STAGEDIR}${DATADIR}/help/set
 .for f in channels.mod/help/set/channels.help \
 	compress.mod/help/set/compress.help \
 	console.mod/help/set/console.help ctcp.mod/help/set/ctcp.help \
 	filesys.mod/help/set/filesys.help irc.mod/help/set/irc.help \
 	notes.mod/help/set/notes.help server.mod/help/set/server.help \
 	share.mod/help/set/share.help transfer.mod/help/set/transfer.help
-	${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help/set
+	${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${STAGEDIR}${DATADIR}/help/set
 .endfor
-	@${MKDIR} ${DATADIR}/help/msg
+	@${MKDIR} ${STAGEDIR}${DATADIR}/help/msg
 .for f in irc.mod/help/msg/irc.help notes.mod/help/msg/notes.help \
 	seen.mod/help/msg/seen.help
-	${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help/msg
+	${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${STAGEDIR}${DATADIR}/help/msg
 .endfor
-	@${MKDIR} ${DATADIR}/language
-	${INSTALL_DATA} ${WRKSRC}/language/core.*.lang ${DATADIR}/language
+	@${MKDIR} ${STAGEDIR}${DATADIR}/language
+	${INSTALL_DATA} ${WRKSRC}/language/core.*.lang ${STAGEDIR}${DATADIR}/language
 	@cd ${WRKSRC}/src/mod \
 		&& ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
-			${DATADIR}/language ";"
-	@${MKDIR} ${DATADIR}/scripts
+			${STAGEDIR}${DATADIR}/language ";"
+	@${MKDIR} ${STAGEDIR}${DATADIR}/scripts
 .for f in CONTENTS action.fix.tcl autobotchk alltools.tcl botchk \
 	cmd_resolve.tcl compat.tcl dccwhois.tcl getops.tcl klined.tcl notes2.tcl ques5.tcl \
 	quotepass.tcl quotepong.tcl sentinel.tcl userinfo.tcl weed
-	${INSTALL_DATA} ${WRKSRC}/scripts/${f} ${DATADIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/scripts/${f} ${STAGEDIR}${DATADIR}/scripts
 .endfor
-	@${MKDIR} ${DATADIR}/scripts/help
+	@${MKDIR} ${STAGEDIR}${DATADIR}/scripts/help
 .for f in cmd_resolve.help userinfo.help
-	${INSTALL_DATA} ${WRKSRC}/scripts/help/${f} ${DATADIR}/scripts/help
+	${INSTALL_DATA} ${WRKSRC}/scripts/help/${f} ${STAGEDIR}${DATADIR}/scripts/help
 .endfor
-	@${MKDIR} ${DATADIR}/scripts/help/msg
+	@${MKDIR} ${STAGEDIR}${DATADIR}/scripts/help/msg
 .for f in userinfo.help
-	${INSTALL_DATA} ${WRKSRC}/scripts/help/msg/${f} ${DATADIR}/scripts/help/msg
+	${INSTALL_DATA} ${WRKSRC}/scripts/help/msg/${f} ${STAGEDIR}${DATADIR}/scripts/help/msg
 .endfor
 .for f in cmds1.help cmds2.help core.help
-	${INSTALL_DATA} ${WRKSRC}/help/${f} ${DATADIR}/help
+	${INSTALL_DATA} ${WRKSRC}/help/${f} ${STAGEDIR}${DATADIR}/help
 .endfor
 .for f in cmds1.help
-	${INSTALL_DATA} ${WRKSRC}/help/set/${f} ${DATADIR}/help/set
+	${INSTALL_DATA} ${WRKSRC}/help/set/${f} ${STAGEDIR}${DATADIR}/help/set
 .endfor
-	@${MKDIR} ${DATADIR}/text
+	@${MKDIR} ${STAGEDIR}${DATADIR}/text
 .for f in banner motd
-	${INSTALL_DATA} ${WRKSRC}/text/${f} ${DATADIR}/text
+	${INSTALL_DATA} ${WRKSRC}/text/${f} ${STAGEDIR}${DATADIR}/text
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ABOUT BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \
 	FIRST-SCRIPT KNOWN-PROBLEMS MODULES PARTYLINE PATCH-HOWTO \
 	TEXT-SUBSTITUTIONS TRICKS Changes1.8 USERS WEIRD-MESSAGES \
 	tcl-commands.doc
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${MKDIR} ${DOCSDIR}/html
-	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DOCSDIR}/html
-	@${MKDIR} ${DOCSDIR}/settings
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}/html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/settings
 	cd ${WRKSRC}/doc/settings && ${RM} -rf CVS \
-		&& ${INSTALL_DATA} * ${DOCSDIR}/settings
+		&& ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/settings
 .endif
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/eggdrop-devel/pkg-plist b/irc/eggdrop-devel/pkg-plist
index c2c0998eebd1..ae4843281701 100644
--- a/irc/eggdrop-devel/pkg-plist
+++ b/irc/eggdrop-devel/pkg-plist
@@ -15,6 +15,7 @@ lib/eggdrop/server.so
 lib/eggdrop/share.so
 lib/eggdrop/transfer.so
 lib/eggdrop/uptime.so
+man/man1/eggdrop.1.gz
 %%DOCSDIR%%/ABOUT
 %%DOCSDIR%%/BANS
 %%DOCSDIR%%/BOTNET