From owner-svn-ports-all@FreeBSD.ORG Wed Aug 15 01:04:31 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 37012106566B; Wed, 15 Aug 2012 01:04:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 200488FC0A; Wed, 15 Aug 2012 01:04:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7F14UZK077971; Wed, 15 Aug 2012 01:04:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7F14UmU077962; Wed, 15 Aug 2012 01:04:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201208150104.q7F14UmU077962@svn.freebsd.org> From: Doug Barton Date: Wed, 15 Aug 2012 01:04:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302555 - in head: dns/dualserver ftp/smbftpd irc/inspircd12 irc/tircd mail/couriergraph mail/exilog mail/missey mail/spamilter X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 15 Aug 2012 01:04:31 -0000 Author: dougb Date: Wed Aug 15 01:04:30 2012 New Revision: 302555 URL: http://svn.freebsd.org/changeset/ports/302555 Log: Fix problem introduced in r302141. The directory for the unpacked source files is unversioned, so it conflicts with the name of the rc.d script in WRKDIR after SUB_FILES is applied. Modified: head/dns/dualserver/Makefile head/ftp/smbftpd/Makefile head/irc/inspircd12/Makefile head/irc/tircd/Makefile head/mail/couriergraph/Makefile head/mail/exilog/Makefile head/mail/missey/Makefile head/mail/spamilter/Makefile Modified: head/dns/dualserver/Makefile ============================================================================== --- head/dns/dualserver/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/dns/dualserver/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -14,11 +14,13 @@ COMMENT= Combined DHCP/DNS server for sm USE_DOS2UNIX= yes USE_RC_SUBR= dualserver -WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= sbin/dualserver etc/dualserver.conf.sample .include +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + pre-patch: ${REINPLACE_CMD} 's|/etc/dualserver.ini|${PREFIX}/etc/dualserver.conf|' ${WRKSRC}/dualserver.cpp ${REINPLACE_CMD} 's|/etc/dualserver.state|/var/run/dualserver.state|' ${WRKSRC}/dualserver.cpp Modified: head/ftp/smbftpd/Makefile ============================================================================== --- head/ftp/smbftpd/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/ftp/smbftpd/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -24,7 +24,6 @@ HAS_CONFIGURE= yes MAKE_ENV= OSTYPE=FreeBSD CONFIGURE_ARGS= "--prefix=${PREFIX}" -WRKSRC= ${WRKDIR}/${PORTNAME} USE_PERL5= yes USE_RC_SUBR= ${PORTNAME} @@ -49,6 +48,9 @@ CONFIGURE_ARGS+= "--with-iconv" CONFIGURE_ARGS+= "--with-ssl" .endif +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: @${REINPLACE_CMD} -e '/^CONFIGS = / s|\.conf|&.sample|g' ${WRKSRC}/Makefile @cd ${WRKSRC}/conf/ && (${LS} *.conf | ${XARGS} -I % ${MV} % %.sample) Modified: head/irc/inspircd12/Makefile ============================================================================== --- head/irc/inspircd12/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/irc/inspircd12/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -18,7 +18,6 @@ CONFLICTS= inspircd-2.* LATEST_LINK= inspircd12 -WRKSRC= ${WRKDIR}/inspircd USE_BZIP2= yes USE_LDCONFIG= ${PREFIX}/lib/inspircd USE_RC_SUBR= inspircd @@ -178,6 +177,9 @@ PLIST_SUB+= ZIPLINK="@comment " CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: ${REINPLACE_CMD} -e '/INSTMODE/s|700|755|;/install -d.*BINPATH/d'\ -e 's,FLAGS = @FLAGS@,FLAGS = ${CXXFLAGS} @FLAGS@,' \ Modified: head/irc/tircd/Makefile ============================================================================== --- head/irc/tircd/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/irc/tircd/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -24,14 +24,15 @@ RUN_DEPENDS= p5-JSON-Any>=0:${PORTSDIR}/ p5-POE>=0:${PORTSDIR}/devel/p5-POE \ p5-POE-Filter-IRCD>=0:${PORTSDIR}/irc/p5-POE-Filter-IRCD -WRKSRC= ${WRKDIR}/tircd - USE_PERL5= yes NO_BUILD= yes MAN1= tircd.1 USE_RC_SUBR= tircd +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: ${REINPLACE_CMD} -e '1s,^#!/usr/bin/perl,#!${PREFIX}/bin/perl,' \ -e 's,/etc/tircd.cfg,${PREFIX}/etc/tircd.cfg,g' \ Modified: head/mail/couriergraph/Makefile ============================================================================== --- head/mail/couriergraph/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/mail/couriergraph/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -20,7 +20,6 @@ RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/data NO_BUILD= yes USE_PERL5= yes -WRKSRC= ${WRKDIR}/${PORTNAME} DATADIR?= /var/db/couriergraph COURIERGRAPH_USER?= ${WWWOWN} @@ -42,6 +41,9 @@ pre-everything:: @${ECHO_MSG} "COURIERGRAPH_GROUP=www Group to run couriergraph (Default: ${WWWGRP})" @${ECHO_MSG} +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.cgi @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.pl Modified: head/mail/exilog/Makefile ============================================================================== --- head/mail/exilog/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/mail/exilog/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -20,7 +20,6 @@ RUN_DEPENDS= p5-Net-Netmask>=0:${PORTSDI USE_PERL5= yes NO_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME} # Default sql backend WITH_SQL_BACKEND?= mysql @@ -59,6 +58,9 @@ PORTDOC_FILES= doc/Changelog \ doc/pgsql-db-script.sql .endif +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + pre-patch: @${REINPLACE_CMD} -e 's,$$RealBin/exilog.conf,${PREFIX}/etc/exilog.conf,' ${WRKSRC}/exilog_config.pm @${REINPLACE_CMD} -e "s,\(use exilog_config\),use lib \'${EXILOGDIR}\'; \1," ${WRKSRC}/exilog_agent.pl Modified: head/mail/missey/Makefile ============================================================================== --- head/mail/missey/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/mail/missey/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -18,8 +18,6 @@ COMMENT= Secure small and high performan USE_BZIP2= yes -WRKSRC= ${WRKDIR}/mps/src - MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}" WRKSRC="${WRKSRC}" @@ -29,6 +27,9 @@ PLIST_DIRS= etc/mps USE_RC_SUBR= mps +post-extract: + @${MV} ${WRKDIR}/mps/src ${WRKSRC} + post-patch: @${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile Modified: head/mail/spamilter/Makefile ============================================================================== --- head/mail/spamilter/Makefile Wed Aug 15 01:01:43 2012 (r302554) +++ head/mail/spamilter/Makefile Wed Aug 15 01:04:30 2012 (r302555) @@ -23,7 +23,6 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --have-resn USE_RC_SUBR= spamilter -WRKSRC= ${WRKDIR}/${PORTNAME} CFLAGS+= ${PTHREAD_CFLAGS:S=""==} LDFLAGS+= ${PTHREAD_LIBS} MAKE_ENV+= __MAKE_CONF=/dev/null @@ -64,6 +63,9 @@ PLIST_FILES+= bin/dnsblchk bin/dnsblupd PORTDOCS= Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \ db.rdnsbl db.sndr policy.html spamilter.rc +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + pre-configure: ${REINPLACE_CMD} \ -e "s=/etc/spamilter.rc=${PREFIX}/etc/spamilter.rc=" \