From owner-svn-ports-all@FreeBSD.ORG Wed Jun 4 02:27:24 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 DF6E6E75; Wed, 4 Jun 2014 02:27:23 +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 CAB4F24FD; Wed, 4 Jun 2014 02:27:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s542RNLM071446; Wed, 4 Jun 2014 02:27:23 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s542RM91071431; Wed, 4 Jun 2014 02:27:22 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201406040227.s542RM91071431@svn.freebsd.org> From: Cy Schubert Date: Wed, 4 Jun 2014 02:27:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356420 - in head: sysutils/curly sysutils/doinkd sysutils/doinkd/files sysutils/zetaback www/webcopy www/webcopy/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.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: Wed, 04 Jun 2014 02:27:24 -0000 Author: cy Date: Wed Jun 4 02:27:21 2014 New Revision: 356420 URL: http://svnweb.freebsd.org/changeset/ports/356420 QAT: https://qat.redports.org/buildarchive/r356420/ Log: Stagify, modernize. Modified: head/sysutils/curly/Makefile head/sysutils/curly/pkg-plist head/sysutils/doinkd/Makefile head/sysutils/doinkd/files/patch-Makefile head/sysutils/zetaback/Makefile head/sysutils/zetaback/pkg-plist head/www/webcopy/Makefile head/www/webcopy/files/patch-aa Modified: head/sysutils/curly/Makefile ============================================================================== --- head/sysutils/curly/Makefile Wed Jun 4 00:32:31 2014 (r356419) +++ head/sysutils/curly/Makefile Wed Jun 4 02:27:21 2014 (r356420) @@ -19,10 +19,7 @@ BUILD_DEPENDS= makeme:${PORTSDIR}/devel/ MAKE_FLAGS= MAKEFILE= -MAN1= ${PORTNAME}.1 -MLINKS= ${PORTNAME}.1 un${PORTNAME}.1 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,CFLAGS=,CFLAGS+=,' -e 's,^DEBUG,#DEBUG,'\ -e 's,gcc,${CC},' ${WRKSRC}/bin/curly/Make.host @@ -35,6 +32,7 @@ do-install: ( cd ${WRKSRC}/bin/curly && ${SETENV} ${MAKENV} makeme \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} ) ${INSTALL_MAN} ${WRKSRC}/bin/${PORTNAME}/${PORTNAME}.man \ - ${PREFIX}/man/man1/${PORTNAME}.1 + ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1 + ${LN} -s ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/un${PORTNAME}.1 .include Modified: head/sysutils/curly/pkg-plist ============================================================================== --- head/sysutils/curly/pkg-plist Wed Jun 4 00:32:31 2014 (r356419) +++ head/sysutils/curly/pkg-plist Wed Jun 4 02:27:21 2014 (r356420) @@ -1,2 +1,4 @@ bin/curly bin/uncurly +man/man1/curly.1.gz +man/man1/uncurly.1.gz Modified: head/sysutils/doinkd/Makefile ============================================================================== --- head/sysutils/doinkd/Makefile Wed Jun 4 00:32:31 2014 (r356419) +++ head/sysutils/doinkd/Makefile Wed Jun 4 02:27:21 2014 (r356420) @@ -10,25 +10,19 @@ MASTER_SITES= SF/idled/${PORTNAME}/${POR MAINTAINER= cy@FreeBSD.org COMMENT= A daemon that logs out idle users and those users hogging resources -MANCOMPRESSED= yes -MAN5= doinkd.cf.5 -MAN8= doinkd.8 - USE_RC_SUBR= ${PORTNAME} -PLIST_FILES= etc/doinkd/doinkd.cf.template sbin/doinkd -PLIST_DIRSTRY= etc/doinkd +MAKE_ARGS= STAGEDIR=${STAGEDIR} -NO_STAGE= yes .include post-extract: (cd ${WRKSRC}; make clean) pre-install: - ${MKDIR} ${PREFIX}/etc/doinkd + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/doinkd post-install: - @${STRIP_CMD} ${PREFIX}/sbin/doinkd + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/doinkd .include Modified: head/sysutils/doinkd/files/patch-Makefile ============================================================================== --- head/sysutils/doinkd/files/patch-Makefile Wed Jun 4 00:32:31 2014 (r356419) +++ head/sysutils/doinkd/files/patch-Makefile Wed Jun 4 02:27:21 2014 (r356420) @@ -1,5 +1,5 @@ --- Makefile.orig 2006-05-30 00:19:28.000000000 -0700 -+++ Makefile 2010-08-27 12:42:08.661284827 -0700 ++++ Makefile 2014-06-03 18:33:50.171999588 -0700 @@ -2,8 +2,8 @@ # @@ -20,7 +20,7 @@ SPECLIBS = INSTTYPE = install4 -@@ -193,26 +193,26 @@ +@@ -193,26 +193,27 @@ # You will need to delete parse.c before compiling! You can either # do so by hand, or do a 'make clean' followed by the normal 'make'. #DEFS += -O -m486 @@ -35,9 +35,10 @@ -#CFDEST = /etc/doinkd -#MDEST = /usr/local/man -#LOGDEST = /var/log -+DEST = ${PREFIX}/sbin -+CFDEST = ${PREFIX}/etc/doinkd -+MDEST = ${PREFIX}/man ++DEST = ${STAGEDIR}${PREFIX}/sbin ++CFDEST = ${STAGEDIR}${PREFIX}/etc/doinkd ++CFDEST_REAL = ${PREFIX}/etc/doinkd ++MDEST = ${STAGEDIR}${PREFIX}/man +LOGDEST = /var/log # #OWNER = root @@ -59,3 +60,28 @@ ###################################################################### ###################################################################### +@@ -450,7 +451,7 @@ + PMAN = doinkd.8 + + # Names of config and log files +-CONFIG = ${CFDEST}/${COMMFILE} ++CONFIG = ${CFDEST_REAL}/${COMMFILE} + LOGFILE = ${LOGDEST}/doinkd.log + + # HERE are the big CFLAGS +@@ -509,11 +510,11 @@ + # BSD like, but with some enhancements like: install -s -> strip binary + # gzip manual pages + install1a: all +- install -s -c -m ${MODE} -o ${OWNER} -g ${GROUP} ${BINARY} ${DEST} +- install -c -m ${CFMODE} -o ${CFOWNER} -g ${CFGROUP} ${COMMFILE}.template ${CFDEST} +- install -c -m ${MMODE} -o ${MOWNER} ${CFMAN} ${MDEST}/man5 ++ install -s -c -m ${MODE} ${BINARY} ${DEST} ++ install -c -m ${CFMODE} ${COMMFILE}.template ${CFDEST} ++ install -c -m ${MMODE} ${CFMAN} ${MDEST}/man5 + gzip -f ${MDEST}/man5/${CFMAN} +- install -c -m ${MMODE} -o ${MOWNER} ${PMAN} ${MDEST}/man8 ++ install -c -m ${MMODE} ${PMAN} ${MDEST}/man8 + gzip -f ${MDEST}/man8/${PMAN} + @echo "" + @echo "Be sure to edit/create the file ${CONFIG} based on" Modified: head/sysutils/zetaback/Makefile ============================================================================== --- head/sysutils/zetaback/Makefile Wed Jun 4 00:32:31 2014 (r356419) +++ head/sysutils/zetaback/Makefile Wed Jun 4 02:27:21 2014 (r356420) @@ -15,11 +15,8 @@ USE_PERL5= run GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf -MAN1= zetaback.1 zetaback_agent.1 - -NO_STAGE= yes post-install: - @${TEST} ! -f ${PREFIX}/etc/zetaback.conf && ${CP} ${PREFIX}/etc/zetaback.conf.sample ${PREFIX}/etc/zetaback.conf; ${TRUE} - @${TEST} ! -f ${PREFIX}/etc/zetaback_agent.conf && ${CP} ${PREFIX}/etc/zetaback_agent.conf.sample ${PREFIX}/etc/zetaback_agent.conf; ${TRUE} + @${TEST} ! -f ${PREFIX}/etc/zetaback.conf && ${CP} ${STAGEDIR}${PREFIX}/etc/zetaback.conf.sample ${STAGEDIR}${PREFIX}/etc/zetaback.conf; ${TRUE} + @${TEST} ! -f ${PREFIX}/etc/zetaback_agent.conf && ${CP} ${STAGEDIR}${PREFIX}/etc/zetaback_agent.conf.sample ${STAGEDIR}${PREFIX}/etc/zetaback_agent.conf; ${TRUE} .include Modified: head/sysutils/zetaback/pkg-plist ============================================================================== --- head/sysutils/zetaback/pkg-plist Wed Jun 4 00:32:31 2014 (r356419) +++ head/sysutils/zetaback/pkg-plist Wed Jun 4 02:27:21 2014 (r356420) @@ -4,3 +4,6 @@ bin/zetaback bin/zetaback_agent etc/zetaback.conf.sample etc/zetaback_agent.conf.sample +man/man1/zetaback.1.gz +man/man1/zetaback_agent.1.gz + Modified: head/www/webcopy/Makefile ============================================================================== --- head/www/webcopy/Makefile Wed Jun 4 00:32:31 2014 (r356419) +++ head/www/webcopy/Makefile Wed Jun 4 02:27:21 2014 (r356420) @@ -13,11 +13,11 @@ COMMENT= A Web Mirroring Program RESTRICTED= This program cannot be distributed if modified in any way. Don't sell for profit without written permission ALL_TARGET= -NO_STAGE= yes +USES= perl5 + do-install: - cd ${WRKSRC}; ${INSTALL_SCRIPT} webcopy ${PREFIX}/bin - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \ - ${PREFIX}/share/doc/webcopy - cd ${WRKSRC}; ${INSTALL_DATA} webcopy.html ${PREFIX}/share/doc/webcopy + cd ${WRKSRC}; ${INSTALL_SCRIPT} webcopy ${STAGEDIR}${PREFIX}/bin + ${INSTALL} -d -m 755 ${STAGEDIR}${PREFIX}/share/doc/webcopy + cd ${WRKSRC}; ${INSTALL_DATA} webcopy.html ${STAGEDIR}${PREFIX}/share/doc/webcopy .include Modified: head/www/webcopy/files/patch-aa ============================================================================== --- head/www/webcopy/files/patch-aa Wed Jun 4 00:32:31 2014 (r356419) +++ head/www/webcopy/files/patch-aa Wed Jun 4 02:27:21 2014 (r356420) @@ -1,54 +1,19 @@ -*** Makefile.bak Sat Jun 8 20:42:14 1996 ---- Makefile Sat Sep 14 04:07:01 1996 -*************** -*** 32,40 **** - - # Select or change one of the following perl interpreters: - -! PERL=/usr/local/bin/perl - #PERL=/usr/local/ucb/perl -! #PERL=/usr/bin/perl - #PERL=/usr/ucb/perl - #PERL=/bin/perl - #PERL=$(HOME)/bin/perl ---- 32,40 ---- - - # Select or change one of the following perl interpreters: - -! #PERL=/usr/local/bin/perl - #PERL=/usr/local/ucb/perl -! PERL=/usr/bin/perl - #PERL=/usr/ucb/perl - #PERL=/bin/perl - #PERL=$(HOME)/bin/perl -*************** -*** 43,56 **** - - # Select or change one of the following WebCopy destination: - -! DESTINATION=webcopy.test - #DESTINATION=/usr/local/bin/webcopy - #DESTINATION=/usr/local/ucb/webcopy - #DESTINATION=/usr/bin/webcopy - #DESTINATION=/usr/ucb/webcopy - #DESTINATION=/bin/webcopy - #DESTINATION=$(HOME)/bin/webcopy -! #DESTINATION= - - # Select default perl interpreter version: - ---- 43,56 ---- - - # Select or change one of the following WebCopy destination: - -! #DESTINATION=webcopy.test - #DESTINATION=/usr/local/bin/webcopy - #DESTINATION=/usr/local/ucb/webcopy - #DESTINATION=/usr/bin/webcopy - #DESTINATION=/usr/ucb/webcopy - #DESTINATION=/bin/webcopy - #DESTINATION=$(HOME)/bin/webcopy -! DESTINATION=$(PREFIX)/bin/webcopy - - # Select default perl interpreter version: - +--- Makefile.orig 1996-06-08 09:42:14.000000000 -0700 ++++ Makefile 2014-06-03 17:06:14.896004168 -0700 +@@ -43,14 +43,14 @@ + + # Select or change one of the following WebCopy destination: + +-DESTINATION=webcopy.test ++#DESTINATION=webcopy.test + #DESTINATION=/usr/local/bin/webcopy + #DESTINATION=/usr/local/ucb/webcopy + #DESTINATION=/usr/bin/webcopy + #DESTINATION=/usr/ucb/webcopy + #DESTINATION=/bin/webcopy + #DESTINATION=$(HOME)/bin/webcopy +-#DESTINATION= ++DESTINATION=$(PREFIX)/bin/webcopy + + # Select default perl interpreter version: +