Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Feb 2014 09:47:01 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345196 - head/irc/eggdrop
Message-ID:  <201402200947.s1K9l1mO075494@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Thu Feb 20 09:47:01 2014
New Revision: 345196
URL: http://svnweb.freebsd.org/changeset/ports/345196
QAT: https://qat.redports.org/buildarchive/r345196/

Log:
  - Convert to USES=tcl
  - STAGE-clean

Modified:
  head/irc/eggdrop/Makefile
  head/irc/eggdrop/pkg-plist

Modified: head/irc/eggdrop/Makefile
==============================================================================
--- head/irc/eggdrop/Makefile	Thu Feb 20 09:33:20 2014	(r345195)
+++ head/irc/eggdrop/Makefile	Thu Feb 20 09:47:01 2014	(r345196)
@@ -14,18 +14,18 @@ COMMENT=	The most popular open source In
 
 LICENSE=        GPLv2
 
-USE_TCL=	85+
+OPTIONS_DEFINE=	DOCS
+
+USES=		tcl:85+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \
+CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
 		--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		eggdrop.1
-
 SUB_FILES=	pkg-message
+PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
@@ -37,16 +37,16 @@ post-configure:
 #	@(cd ${WRKSRC}/src && ${LN} -fs ../config.h)
 
 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}${PREFIX}/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 wire.so
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/eggdrop
+	${INSTALL_PROGRAM} ${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 \
@@ -55,64 +55,63 @@ do-install:
 	server.mod/help/server.help share.mod/help/share.help \
 	transfer.mod/help/transfer.help uptime.mod/help/uptime.help \
 	wire.mod/help/wire.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.6 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
-	cd ${WRKSRC}/doc/settings && ${INSTALL_DATA} * ${DOCSDIR}/settings
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}/html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/settings
+	cd ${WRKSRC}/doc/settings && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/settings
 .endif
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/irc/eggdrop/pkg-plist
==============================================================================
--- head/irc/eggdrop/pkg-plist	Thu Feb 20 09:33:20 2014	(r345195)
+++ head/irc/eggdrop/pkg-plist	Thu Feb 20 09:47:01 2014	(r345196)
@@ -1,5 +1,6 @@
 bin/eggdrop
 etc/eggdrop.conf.sample
+man/man1/eggdrop.1.gz
 lib/eggdrop/assoc.so
 lib/eggdrop/blowfish.so
 lib/eggdrop/channels.so
@@ -16,79 +17,6 @@ lib/eggdrop/share.so
 lib/eggdrop/transfer.so
 lib/eggdrop/uptime.so
 lib/eggdrop/wire.so
-%%PORTDOCS%%%%DOCSDIR%%/ABOUT
-%%PORTDOCS%%%%DOCSDIR%%/BANS
-%%PORTDOCS%%%%DOCSDIR%%/BOTNET
-%%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT
-%%PORTDOCS%%%%DOCSDIR%%/COMPILE-GUIDE
-%%PORTDOCS%%%%DOCSDIR%%/CONTENTS
-%%PORTDOCS%%%%DOCSDIR%%/Changes1.6
-%%PORTDOCS%%%%DOCSDIR%%/FIRST-SCRIPT
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-PROBLEMS
-%%PORTDOCS%%%%DOCSDIR%%/MODULES
-%%PORTDOCS%%%%DOCSDIR%%/PARTYLINE
-%%PORTDOCS%%%%DOCSDIR%%/PATCH-HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/TEXT-SUBSTITUTIONS
-%%PORTDOCS%%%%DOCSDIR%%/TRICKS
-%%PORTDOCS%%%%DOCSDIR%%/USERS
-%%PORTDOCS%%%%DOCSDIR%%/WEIRD-MESSAGES
-%%PORTDOCS%%%%DOCSDIR%%/html/about.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-problems.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-textsub.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-tricks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-weird.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bans.html
-%%PORTDOCS%%%%DOCSDIR%%/html/botnet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/compiling.html
-%%PORTDOCS%%%%DOCSDIR%%/html/egg-core.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faqs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/features.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/install.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-assoc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-blowfish.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-channels.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-compress.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-console.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-ctcp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-dns.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-filesys.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-irc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-notes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-seen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-server.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-share.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-transfer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-uptime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-wire.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-woobie.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%/html/party.html
-%%PORTDOCS%%%%DOCSDIR%%/html/patch-howto.html
-%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
-%%PORTDOCS%%%%DOCSDIR%%/html/starting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tcl-commands.html
-%%PORTDOCS%%%%DOCSDIR%%/html/users.html
-%%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS
-%%PORTDOCS%%%%DOCSDIR%%/settings/core.settings
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.assoc
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.blowfish
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.channels
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.compress
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.console
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.ctcp
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.dns
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.filesys
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.irc
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.notes
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.seen
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.server
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.share
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.transfer
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.uptime
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.wire
-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.woobie
-%%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc
 %%DATADIR%%/help/assoc.help
 %%DATADIR%%/help/chaninfo.help
 %%DATADIR%%/help/channels.help
@@ -187,7 +115,4 @@ lib/eggdrop/wire.so
 @dirrm %%DATADIR%%/help/msg
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/settings
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/eggdrop



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402200947.s1K9l1mO075494>