From owner-svn-ports-all@FreeBSD.ORG Sun Dec 29 15:46:16 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A85E671; Sun, 29 Dec 2013 15:46:16 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 53AF01DC0; Sun, 29 Dec 2013 15:46:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBTFkGRk096451; Sun, 29 Dec 2013 15:46:16 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBTFkD6h096435; Sun, 29 Dec 2013 15:46:13 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201312291546.rBTFkD6h096435@svn.freebsd.org> From: Chris Rees Date: Sun, 29 Dec 2013 15:46:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338013 - in head: irc/charybdis irc/charybdis/files java/castor java/jgraph java/jgraphx mail/biabam mail/biabam/files mail/sympa mail/sympa/files 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.17 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: Sun, 29 Dec 2013 15:46:16 -0000 Author: crees Date: Sun Dec 29 15:46:13 2013 New Revision: 338013 URL: http://svnweb.freebsd.org/changeset/ports/338013 Log: Stage ports maintained by me in irc java mail Cleanups in several places Modified: head/irc/charybdis/Makefile head/irc/charybdis/files/charybdis.in head/irc/charybdis/pkg-plist head/java/castor/Makefile head/java/jgraph/Makefile head/java/jgraphx/Makefile head/mail/biabam/Makefile head/mail/biabam/files/patch-biabam head/mail/sympa/Makefile head/mail/sympa/files/pkg-install.in head/mail/sympa/pkg-descr head/mail/sympa/pkg-plist Modified: head/irc/charybdis/Makefile ============================================================================== --- head/irc/charybdis/Makefile Sun Dec 29 15:44:50 2013 (r338012) +++ head/irc/charybdis/Makefile Sun Dec 29 15:46:13 2013 (r338013) @@ -20,44 +20,38 @@ CONFLICTS= ircd-ratbox-[0-9]* ircd-ratbo expect-[0-9]* whois-[0-9]* undernet-ircu-[0-9]* \ ru-ircd-hybrid-[0-9]* \ -.for s in ${MASTER_SITES} -MASTER_SITES+= $scharybdis-stable-oper-guide/:pdf -.endfor +MASTER_SITES:= ${MASTER_SITES} \ + ${MASTER_SITES:S,$,charybdis-stable-oper-guide/:pdf,} -MAN8= ircd.8 PORTDOCS= charybdis-oper-guide.pdf -USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf -USES= pathfix +USES= pathfix USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes -USERS= ircd -GROUPS= ircd +USERS= ircd +GROUPS= ircd CONFIGURE_ARGS= --with-confdir=${ETCDIR} \ --with-helpdir=${DATADIR}/help \ --with-logdir=/var/log/${PORTNAME} \ --with-moduledir=${DATADIR}/modules \ --enable-kqueue -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDOCS} -. for d in ${PORTDOCS} -DOCSDIST+= $d:pdf -. endfor +DOCSDIST+= ${PORTDOCS}:pdf .endif -pre-su-install: - @${MKDIR} ${DATADIR} +pre-install: + @${MKDIR} ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${DISTDIR}/charybdis-oper-guide.pdf ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${DISTDIR}/charybdis-oper-guide.pdf \ + ${STAGEDIR}${DOCSDIR} .endif - @${MKDIR} ${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${ETCDIR}/ircd.motd.sample - @[ -f ${ETCDIR}/ircd.motd ] || ${CP} -p ${ETCDIR}/ircd.motd.sample \ - ${ETCDIR}/ircd.motd + @${MKDIR} ${STAGEDIR}${ETCDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd \ + ${STAGEDIR}${ETCDIR}/ircd.motd.sample .include Modified: head/irc/charybdis/files/charybdis.in ============================================================================== --- head/irc/charybdis/files/charybdis.in Sun Dec 29 15:44:50 2013 (r338012) +++ head/irc/charybdis/files/charybdis.in Sun Dec 29 15:46:13 2013 (r338013) @@ -1,5 +1,5 @@ #!/bin/sh - +# # $FreeBSD$ # # PROVIDE: charybdis Modified: head/irc/charybdis/pkg-plist ============================================================================== --- head/irc/charybdis/pkg-plist Sun Dec 29 15:44:50 2013 (r338012) +++ head/irc/charybdis/pkg-plist Sun Dec 29 15:46:13 2013 (r338013) @@ -12,10 +12,11 @@ etc/charybdis/example.conf @unexec cmp -s %D/etc/charybdis/ircd.motd.sample %D/etc/charybdis/ircd.motd && rm -f %D/etc/charybdis/ircd.motd || true etc/charybdis/ircd.motd.sample @exec [ -f %D/ircd.motd ] || cp -p %D/%F %B/ircd.motd -etc/charybdis/reference.conf +%%ETCDIR%%/reference.conf lib/libratbox.la lib/libratbox.so libdata/pkgconfig/libratbox.pc +man/man8/ircd.8.gz %%DATADIR%%/help/opers/accept %%DATADIR%%/help/opers/admin %%DATADIR%%/help/opers/away @@ -279,10 +280,11 @@ libdata/pkgconfig/libratbox.pc %%DATADIR%%/modules/m_squit.so @dirrm %%DATADIR%%/modules/extensions @dirrm %%DATADIR%%/modules/autoload -@dirrm %%DATADIR%%/modules-old @dirrm %%DATADIR%%/modules @dirrm %%DATADIR%%/help/users @dirrm %%DATADIR%%/help/opers @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% -@dirrm etc/charybdis +@dirrm %%ETCDIR%% +@unexec rmdir >/dev/null 2>&1 /var/log/charybdis || : +@unexec rmdir >/dev/null 2>&1 /var/db/charybdis || : Modified: head/java/castor/Makefile ============================================================================== --- head/java/castor/Makefile Sun Dec 29 15:44:50 2013 (r338012) +++ head/java/castor/Makefile Sun Dec 29 15:46:13 2013 (r338013) @@ -27,18 +27,13 @@ PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}- PORTDOCS= *.html *.txt *.css *.dtd *.xsd *.pdf \ ora-mar-2k images rss -NO_STAGE= yes do-install: .for f in ${PLIST_FILES:T:R} - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${f}.jar..." - @${INSTALL_DATA} \ + ${INSTALL_DATA} \ ${WRKSRC}/${f:S/tor/tor-${PORTVERSION}/}.jar \ - ${JAVAJARDIR}/${f}.jar - @${ECHO_MSG} " [ DONE ]" + ${STAGEDIR}${JAVAJARDIR}/${f}.jar .endfor -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) .include Modified: head/java/jgraph/Makefile ============================================================================== --- head/java/jgraph/Makefile Sun Dec 29 15:44:50 2013 (r338012) +++ head/java/jgraph/Makefile Sun Dec 29 15:46:13 2013 (r338013) @@ -12,62 +12,56 @@ EXTRACT_SUFX= .jar MAINTAINER= crees@FreeBSD.org COMMENT= Java Graph Diagram Component -LICENSE= BSD +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +OPTIONS_DEFINE= COMPILE DOCS + +COMPILE_DESC= Compile from source instead of using prebuilt binaries + USE_ZIP= yes NO_WRKSUBDIR= yes USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_RUN= yes -.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) -BUILD_DEPENDS+= ${ANT_CMD}:${PORTSDIR}/devel/apache-ant -ANT_CMD?= ${LOCALBASE}/bin/ant -ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} -.endif - -.if !defined(WITHOUT_COMPILE) -JAVA_BUILD= yes -ANT_TARGETS= jar -.endif +.include -.if !defined(NOPORTDOCS) -ANT_TARGETS+= doc -PORTDOCS= * +.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS+=>${ANT_CMD}:${PORTSDIR}/devel/apache-ant +ANT_CMD?=> ${LOCALBASE}/bin/ant +ANT=> > ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} +. if ${PORT_OPTIONS:MCOMPILE} +JAVA_BUILD=> yes +ANT_TARGETS=> jar +. endif +. if ${PORT_OPTIONS:MDOCS} +ANT_TARGETS+=> doc +PORTDOCS=> * +. endif .endif PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -NO_STAGE= yes -pre-fetch: - @${ECHO_MSG} "" - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} "" - @${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file" - @${ECHO_MSG} "" - do-build: -.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS} @cd ${WRKSRC} && ${ANT} ${ANT_TARGETS} @${MV} -f ${WRKSRC}/build/lib/${PORTNAME}.jar ${WRKSRC}/lib - @${RM} -fr ${WRKSRC}/doc && ${MV} -f ${WRKSRC}/build/doc/api ${WRKSRC}/doc + @${RM} -fr ${WRKSRC}/doc && \ + ${MV} -f ${WRKSRC}/build/doc/api ${WRKSRC}/doc .endif do-install: do-install-jar do-install-javadoc do-install-jar: - @${ECHO_CMD} -n ">> Installing .jar file..." - @${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar - @${ECHO_CMD} " [DONE]" + ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar \ + ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar do-install-javadoc: -.if !defined(NOPORTDOCS) - @${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/doc && ${FIND} . \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} - @${ECHO_CMD} " [DONE]" +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${FIND} . \ + | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/java/jgraphx/Makefile ============================================================================== --- head/java/jgraphx/Makefile Sun Dec 29 15:44:50 2013 (r338012) +++ head/java/jgraphx/Makefile Sun Dec 29 15:46:13 2013 (r338013) @@ -1,4 +1,3 @@ -# Created by: Chris Rees # $FreeBSD$ PORTNAME= jgraphx @@ -19,53 +18,43 @@ USE_GITHUB= yes GH_ACCOUNT= jgraph GH_COMMIT= b445bde +OPTIONS_DEFINE= COMPILE DOCS + +COMPILE_DESC= Compile from source instead of using provided binary + USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_RUN= yes -.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) +.include + +.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= ${ANT_CMD}:${PORTSDIR}/devel/apache-ant ANT_CMD?= ${LOCALBASE}/bin/ant ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} -.endif - -.if !defined(WITHOUT_COMPILE) +. if ${PORT_OPTIONS:MCOMPILE} JAVA_BUILD= yes -.endif - -.if !defined(NOPORTDOCS) -PORTDOCS= * +. endif .endif PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar - -NO_STAGE= yes -pre-fetch: - @${ECHO_MSG} "" - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} "" - @${ECHO_MSG} " WITHOUT_COMPILE=yes Install the pre-compiled .jar file" - @${ECHO_MSG} "" +PORTDOCS= * do-build: -.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) - @cd ${WRKSRC} && ${ANT} ${ANT_TARGETS} +.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS} + cd ${WRKSRC} && ${ANT} ${ANT_TARGETS} .endif do-install: do-install-jar do-install-javadoc do-install-jar: - @${ECHO_CMD} -n ">> Installing .jar file..." - @${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar \ - ${JAVAJARDIR}/${PORTNAME}.jar - @${ECHO_CMD} " [DONE]" + ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar \ + ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar do-install-javadoc: -.if !defined(NOPORTDOCS) - @${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR} - @${ECHO_CMD} " [DONE]" +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/mail/biabam/Makefile ============================================================================== --- head/mail/biabam/Makefile Sun Dec 29 15:44:50 2013 (r338012) +++ head/mail/biabam/Makefile Sun Dec 29 15:46:13 2013 (r338013) @@ -17,13 +17,10 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bas NO_BUILD= yes PLIST_FILES= bin/biabam - -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e '1s|\(#!\)\(/bin/bash\)|\1${LOCALBASE}\2|' \ - ${WRKSRC}/${PORTNAME} +USES= shebangfix +SHEBANG_FILES=${PORTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/biabam ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/biabam ${STAGEDIR}${PREFIX}/bin .include Modified: head/mail/biabam/files/patch-biabam ============================================================================== --- head/mail/biabam/files/patch-biabam Sun Dec 29 15:44:50 2013 (r338012) +++ head/mail/biabam/files/patch-biabam Sun Dec 29 15:46:13 2013 (r338013) @@ -1,3 +1,5 @@ +Note: the jot parts can be removed when 8.x is no longer supported + --- biabam.orig Tue Dec 21 00:08:38 2004 +++ biabam Tue Dec 21 00:10:02 2004 @@ -33,15 +33,15 @@ Modified: head/mail/sympa/Makefile ============================================================================== --- head/mail/sympa/Makefile Sun Dec 29 15:44:50 2013 (r338012) +++ head/mail/sympa/Makefile Sun Dec 29 15:46:13 2013 (r338013) @@ -40,8 +40,10 @@ RUN_DEPENDS+= \ # Ignore alpha/beta versions PORTSCOUT= limit:^[0-9]+(\.[0-9]+)*$$ +NEED_ROOT= yes USERS= sympa GROUPS= sympa +# Shebang is corrected by configure script USES= perl5 GNU_CONFIGURE= yes ICONSDIR?= www/icons @@ -62,11 +64,10 @@ CONFIGURE_ARGS+=--bindir=${PREFIX}/libex CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} MAKE_ENV?= PERL_EXTUTILS_AUTOINSTALL=--skip SUB_FILES= pkg-install +SUB_LIST= DB_TYPE=${DB_TYPE:L} WITH_FASTCGI=${PORT_OPTIONS:MFASTCGI} USE_RC_SUBR= sympa -MAN8= alias_manager.8 archived.8 bounced.8 sympa.8 - CONFLICTS= sympa-5* OPTIONS_DEFINE= FASTCGI APACHE @@ -86,7 +87,6 @@ OPTIONS_SET+= ${option} . endfor .endif -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -107,19 +107,20 @@ RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDI .if ${PORT_OPTIONS:MORACLE} RUN_DEPENDS+= p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle +DB_TYPE= oracle .elif ${PORT_OPTIONS:MPGSQL} SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg +DB_TYPE= pg .elif ${PORT_OPTIONS:MSYBASE} RUN_DEPENDS+= p5-DBD-Sybase>=0:${PORTSDIR}/databases/p5-DBD-Sybase +DB_TYPE= sybase .elif ${PORT_OPTIONS:MMYSQL} SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql +DB_TYPE= mysql .endif -pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - post-patch: @${REINPLACE_CMD} -e 's|^\( *staticdir=\).*$$|\1${DATADIR}|' \ -e 's|^\( *defaultdir=\).*$$|\1${EXAMPLESDIR}|' \ @@ -129,11 +130,7 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|\(--target.*sympa.conf\)|\1.sample|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's/\$$(DESTDIR)\$$(sampledir)/\$$(sampledir)/g' \ + @${REINPLACE_CMD} -e 's#\$$(DESTDIR)\$$(sampledir)#${STAGEDIR}\$$(sampledir)#g' \ ${WRKSRC}/doc/sample/Makefile.in -post-install: - @PKG_PREFIX=${PREFIX} DB_TYPE=${DB_TYPE} WITH_FASTCGI=${WITH_FASTCGI} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include Modified: head/mail/sympa/files/pkg-install.in ============================================================================== --- head/mail/sympa/files/pkg-install.in Sun Dec 29 15:44:50 2013 (r338012) +++ head/mail/sympa/files/pkg-install.in Sun Dec 29 15:46:13 2013 (r338013) @@ -2,10 +2,13 @@ # $FreeBSD$ # +DB_TYPE=%%DB_TYPE%% +WITH_FASTCGI=%%WITH_FASTCGI%% + case $2 in POST-INSTALL) echo "======================================================" - if [ x"${DB_TYPE}" != "x" ]; then + if [ -n "${DB_TYPE}" ]; then echo "If this is your first installation of sympa, please load" echo "this file with your ${DB_TYPE} database client:" echo " %%PREFIX%%/libexec/sympa/create_db.${DB_TYPE}" @@ -32,7 +35,7 @@ POST-INSTALL) echo " AddDefaultCharset UTF-8" echo " DirectoryIndex wws" echo " Options +Indexes" - if [ x"${WITH_FASTCGI}" != x ]; then + if [ -n "${WITH_FASTCGI}" ]; then echo " LoadModule fastcgi_module libexec/apache2/mod_fastcgi.so" echo " " echo " SetHandler fastcgi-script" Modified: head/mail/sympa/pkg-descr ============================================================================== --- head/mail/sympa/pkg-descr Sun Dec 29 15:44:50 2013 (r338012) +++ head/mail/sympa/pkg-descr Sun Dec 29 15:46:13 2013 (r338013) @@ -9,4 +9,4 @@ lists. For a list with 20 000 subscriber message to 90% of subscribers, of course considering that the network is available. -WWW: http://www.sympa.org/ +WWW: http://www.sympa.org/ Modified: head/mail/sympa/pkg-plist ============================================================================== --- head/mail/sympa/pkg-plist Sun Dec 29 15:44:50 2013 (r338012) +++ head/mail/sympa/pkg-plist Sun Dec 29 15:46:13 2013 (r338013) @@ -78,6 +78,10 @@ libexec/sympa/virtualwrapper libexec/sympa/wwslib.pm libexec/sympa/wwsympa-wrapper.fcgi libexec/sympa/wwsympa.fcgi +man/man8/alias_manager.8.gz +man/man8/archived.8.gz +man/man8/bounced.8.gz +man/man8/sympa.8.gz %%EXAMPLESDIR%%/auth.conf %%EXAMPLESDIR%%/ca-bundle.crt %%EXAMPLESDIR%%/charset.conf