From owner-svn-ports-all@FreeBSD.ORG Tue Jul 1 23:25:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61D78B06; Tue, 1 Jul 2014 23:25:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 421EA2B98; Tue, 1 Jul 2014 23:25:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61NPDY0068408; Tue, 1 Jul 2014 23:25:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61NPCJY068406; Tue, 1 Jul 2014 23:25:12 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407012325.s61NPCJY068406@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 1 Jul 2014 23:25:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360115 - head/irc/ircd-ratbox X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2014 23:25:13 -0000 Author: bapt Date: Tue Jul 1 23:25:12 2014 New Revision: 360115 URL: http://svnweb.freebsd.org/changeset/ports/360115 QAT: https://qat.redports.org/buildarchive/r360115/ Log: Support stage Partially strip binaries Convert to USES=libtool Modified: head/irc/ircd-ratbox/Makefile head/irc/ircd-ratbox/pkg-plist Modified: head/irc/ircd-ratbox/Makefile ============================================================================== --- head/irc/ircd-ratbox/Makefile Tue Jul 1 23:20:03 2014 (r360114) +++ head/irc/ircd-ratbox/Makefile Tue Jul 1 23:25:12 2014 (r360115) @@ -14,7 +14,7 @@ LICENSE= GPLv2 CONFLICTS= ircd-ratbox-devel-[0-9]* charybdis-[0-9]* -USE_BZIP2= yes +USES= libtool tar:bzip2 #MAN8= ircd.8 USE_RC_SUBR= ircd-ratbox USE_SQLITE= 3 @@ -39,6 +39,7 @@ CONFIGURE_ARGS= --with-confdir=${PREFIX} --libdir=${PREFIX}/lib/${PORTNAME} \ --with-sqlite3=${LOCALBASE} \ --disable-backups +INSTALL_TARGET= install-strip PORTDOCS= [^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.* @@ -60,7 +61,6 @@ OPTIONS_EXCLUDE= NLS EXAMPLES #---------------------------------------------------------------------- -NO_STAGE= yes .include .if ${PORT_OPTIONS:MOPENSSL} @@ -194,53 +194,39 @@ pre-build: .endif post-build: - @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \ + @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ---- .if ${PORT_OPTIONS:MSHORTCUTS} @${ECHO_MSG} "Building m_rsshortcut.la for ircd-shortcuts." - @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \ + @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la .endif -pre-su-install: - ${MKDIR} ${PREFIX}/etc/${PORTNAME} - ${MKDIR} ${DATADIR}/help - ${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules +pre-install: + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}${DATADIR}/help + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install - ${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample - ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample - ${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample - ${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.sh + ${MKDIR} ${STAGEDIR}${DBDIR} + ${MKDIR} ${STAGEDIR}${RUNDIR} + ${MKDIR} ${STAGEDIR}${LOGDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} + ${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.motd.sample + ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.conf.sample + ${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample + ${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/genssl.sh # ----- We need to install the shortcut.pl module ---- .if ${PORT_OPTIONS:MSHORTCUTS} @${ECHO_MSG} "Executing install-mod.sh for ircd-shortcuts module installation." ${SH} ${WRKSRC}/install-mod.sh ${WRKSRC}/contrib/m_rsshortcut.la \ - ${PREFIX}/lib/${PORTNAME}/modules/contrib + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/contrib .endif - @if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \ - ${ECHO} "Installing default configuration file."; \ - ${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample ${PREFIX}/etc/${PORTNAME}/ircd.conf ; \ - fi - - @if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.motd ]; then \ - ${ECHO} "Installing default motd file."; \ - ${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample ${PREFIX}/etc/${PORTNAME}/ircd.motd ; \ - fi - - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} - -#----------------------------------------------------------------------- - .include Modified: head/irc/ircd-ratbox/pkg-plist ============================================================================== --- head/irc/ircd-ratbox/pkg-plist Tue Jul 1 23:20:03 2014 (r360114) +++ head/irc/ircd-ratbox/pkg-plist Tue Jul 1 23:25:12 2014 (r360115) @@ -138,12 +138,9 @@ libexec/ircd-ratbox/ssld %%DATADIR%%/help/users/who %%DATADIR%%/help/users/whois %%DATADIR%%/help/users/whowas -lib/ircd-ratbox/libcore.la lib/ircd-ratbox/libcore.so -lib/ircd-ratbox/libratbox.la lib/ircd-ratbox/libratbox.so %%SERVICES%%lib/ircd-ratbox/modules/autoload/m_services.so -%%SERVICES%%lib/ircd-ratbox/modules/autoload/m_services.la lib/ircd-ratbox/modules/autoload/m_accept.so lib/ircd-ratbox/modules/autoload/m_admin.so lib/ircd-ratbox/modules/autoload/m_adminwall.so @@ -239,13 +236,9 @@ lib/ircd-ratbox/modules/m_squit.so @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% etc/ircd-ratbox/genssl.sh -etc/ircd-ratbox/ircd-efnet.conf.sample -@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.conf.sample" "%D/etc/ircd-ratbox/ircd.conf"; then rm -f "%D/etc/ircd-ratbox/ircd.conf"; fi -etc/ircd-ratbox/ircd.conf.sample -@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.conf" ] ; then cp -p "%D/%F" "%B/ircd.conf"; fi -@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.motd.sample" "%D/etc/ircd-ratbox/ircd.motd"; then rm -f "%D/etc/ircd-ratbox/ircd.motd"; fi -etc/ircd-ratbox/ircd.motd.sample -@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.motd" ] ; then cp -p "%D/%F" "%B/ircd.motd"; fi +@sample etc/ircd-ratbox/ircd-efnet.conf.sample +@sample etc/ircd-ratbox/ircd.conf.sample +@sample etc/ircd-ratbox/ircd.motd.sample @dirrmtry etc/ircd-ratbox @cwd / @dirrmtry %%LOGDIR%%