Date: Fri, 8 Nov 2013 15:06:29 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333238 - in head/sysutils: bchunk bkpupsd bkpupsd/files cdargs cdbkup cdroot cdroot/files chgrep clonehdd clonehdd/files consolehm cotty cw cw/files Message-ID: <201311081506.rA8F6T0p028721@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Nov 8 15:06:28 2013 New Revision: 333238 URL: http://svnweb.freebsd.org/changeset/ports/333238 Log: Support STAGEDIR. Added: head/sysutils/bkpupsd/files/patch-Makefile (contents, props changed) head/sysutils/cdroot/files/ head/sysutils/cdroot/files/patch-Makefile (contents, props changed) head/sysutils/clonehdd/pkg-message (contents, props changed) head/sysutils/cw/files/ head/sysutils/cw/files/patch-Makefile.in (contents, props changed) Deleted: head/sysutils/bkpupsd/files/patch-aa head/sysutils/clonehdd/files/pkg-message.in Modified: head/sysutils/bchunk/Makefile head/sysutils/bkpupsd/Makefile head/sysutils/bkpupsd/pkg-plist head/sysutils/cdargs/Makefile head/sysutils/cdbkup/Makefile head/sysutils/cdbkup/pkg-plist head/sysutils/cdroot/Makefile head/sysutils/cdroot/pkg-plist head/sysutils/chgrep/Makefile head/sysutils/clonehdd/Makefile head/sysutils/consolehm/Makefile head/sysutils/cotty/Makefile head/sysutils/cw/Makefile head/sysutils/cw/pkg-plist Modified: head/sysutils/bchunk/Makefile ============================================================================== --- head/sysutils/bchunk/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/bchunk/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -9,15 +9,13 @@ MASTER_SITES= http://he.fi/bchunk/ MAINTAINER= ports@FreeBSD.org COMMENT= Converts .bin/.cue files to .iso/audio -MAN1= bchunk.1 -PLIST_FILES= bin/bchunk +PLIST_FILES= bin/bchunk man/man1/bchunk.1.gz -NO_STAGE= yes do-build: cd ${WRKSRC}; ${CC} ${CFLAGS} bchunk.c -o bchunk do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> Modified: head/sysutils/bkpupsd/Makefile ============================================================================== --- head/sysutils/bkpupsd/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/bkpupsd/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -9,7 +9,4 @@ MASTER_SITES= http://ftp.knit.kagoshima- MAINTAINER= ports@FreeBSD.org COMMENT= A simple UPS daemon for APC BK Pro(TM) -MAN8= bkpupsd.8 - -NO_STAGE= yes .include <bsd.port.mk> Added: head/sysutils/bkpupsd/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bkpupsd/files/patch-Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -0,0 +1,38 @@ +--- Makefile.orig 1997-08-04 01:02:37.000000000 +0800 ++++ Makefile 2013-11-08 20:53:42.000000000 +0800 +@@ -5,24 +5,22 @@ + # ver 1.0 A + # + +-CC= /usr/bin/cc +-SBINDIR= /usr/local/sbin +-MANDIR= /usr/local/man +-SCRIPTDIR= /usr/local/libexec ++#CC= /usr/bin/cc ++SBINDIR= ${PREFIX}/sbin ++MANDIR= ${PREFIX}/man/man8 ++SCRIPTDIR= ${PREFIX}/libexec/bkpupsd + + all: ./src/bkpupsd.c +- ${CC} -o ./bin/bkpupsd ./src/bkpupsd.c ++ ${CC} ${CFLAGS} -o ./bin/bkpupsd ./src/bkpupsd.c + + install: +- chown root.wheel ./bin/bkpupsd +- chmod 700 ./bin/bkpupsd +- cp ./bin/bkpupsd ${SBINDIR}/bkpupsd +- cp ./doc/bkpupsd.8 ${MANDIR}/man8/bkpupsd.8 +- chown root.wheel ./scripts/* +- cp -fR ./scripts ${SCRIPTDIR}/bkpupsd ++ ${BSD_INSTALL_PROGRAM} ./bin/bkpupsd ${DESTDIR}${SBINDIR} ++ ${BSD_INSTALL_MAN} ./doc/bkpupsd.8 ${DESTDIR}${MANDIR} ++ mkdir -p ${DESTDIR}${SCRIPTDIR} ++ (cd scripts; for i in *; do ${BSD_INSTALL_SCRIPT} $$i ${DESTDIR}${SCRIPTDIR}; done) + + clean: + rm -f ./bin/bkpupsd + rm -f ${SBINDIR}/bkpupsd +- rm -f ${MANDIR}/man8/bkpupsd.8 +- rm -rf ${SCRIPTDIR}/bkpupsd ++ rm -f ${MANDIR}/bkpupsd.8 ++ rm -rf ${SCRIPTDIR} Modified: head/sysutils/bkpupsd/pkg-plist ============================================================================== --- head/sysutils/bkpupsd/pkg-plist Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/bkpupsd/pkg-plist Fri Nov 8 15:06:28 2013 (r333238) @@ -1,6 +1,7 @@ -sbin/bkpupsd +libexec/bkpupsd/bkpups.battlow libexec/bkpupsd/bkpups.failed libexec/bkpupsd/bkpups.restored libexec/bkpupsd/bkpups.shutdown -libexec/bkpupsd/bkpups.battlow +man/man8/bkpupsd.8.gz +sbin/bkpupsd @dirrm libexec/bkpupsd Modified: head/sysutils/cdargs/Makefile ============================================================================== --- head/sysutils/cdargs/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cdargs/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -15,9 +15,8 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes MAN1= cdargs.1 -PLIST_FILES= bin/cdargs +PLIST_FILES= bin/cdargs man/man1/cdargs.1.gz -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|^AM_CXXFLAGS|#AM_CXXFLAGS|' ${WRKSRC}/src/Makefile.in Modified: head/sysutils/cdbkup/Makefile ============================================================================== --- head/sysutils/cdbkup/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cdbkup/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -13,8 +13,7 @@ COMMENT= Simple but full-featured backup BUILD_DEPENDS= ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \ cdrecord:${PORTSDIR}/sysutils/cdrtools -RUN_DEPENDS= ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \ - cdrecord:${PORTSDIR}/sysutils/cdrtools +RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME} @@ -22,8 +21,6 @@ GNU_CONFIGURE= yes USES= perl5 CONFIGURE_ENV+= PATH=${PATH}:${LOCALBASE}/sbin -MAN1= cdbkup.1 cdappend.1 cdcat.1 cdrstr.1 cdsplit.1 PORTDOCS= README TODO COMPLIANCE -NO_STAGE= yes .include <bsd.port.mk> Modified: head/sysutils/cdbkup/pkg-plist ============================================================================== --- head/sysutils/cdbkup/pkg-plist Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cdbkup/pkg-plist Fri Nov 8 15:06:28 2013 (r333238) @@ -1,3 +1,8 @@ +man/man1/cdappend.1.gz +man/man1/cdbkup.1.gz +man/man1/cdcat.1.gz +man/man1/cdrstr.1.gz +man/man1/cdsplit.1.gz sbin/cdappend sbin/cdbkup sbin/cdcat Modified: head/sysutils/cdroot/Makefile ============================================================================== --- head/sysutils/cdroot/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cdroot/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -10,5 +10,4 @@ MASTER_SITE_SUBDIR= bsd MAINTAINER= ports@FreeBSD.org COMMENT= Scripts to automate setting up a bootable CD-ROM based FreeBSD system -NO_STAGE= yes .include <bsd.port.mk> Added: head/sysutils/cdroot/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdroot/files/patch-Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -0,0 +1,13 @@ +--- Makefile.orig 2002-08-09 22:29:24.000000000 +0800 ++++ Makefile 2013-11-08 21:22:16.000000000 +0800 +@@ -1,8 +1,8 @@ + # $Id: Makefile,v 1.15 2002/08/09 14:29:24 bsd Exp $ + + PREFIX ?= /usr/local +-BINDIR = ${PREFIX}/bin +-LIBDIR = ${PREFIX}/share/cdroot ++BINDIR = ${DESTDIR}${PREFIX}/bin ++LIBDIR = ${DESTDIR}${PREFIX}/share/cdroot + + all : mkcdroot.inst + Modified: head/sysutils/cdroot/pkg-plist ============================================================================== --- head/sysutils/cdroot/pkg-plist Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cdroot/pkg-plist Fri Nov 8 15:06:28 2013 (r333238) @@ -1,8 +1,8 @@ bin/mkcdroot -share/cdroot/README -share/cdroot/cdroot_initdisk -share/cdroot/cdroot_inst -share/cdroot/cdroot_mount -share/cdroot/cdroot_site_overrides.sample -share/cdroot/rc.replacement -@dirrm share/cdroot +%%DATADIR%%/README +%%DATADIR%%/cdroot_initdisk +%%DATADIR%%/cdroot_inst +%%DATADIR%%/cdroot_mount +%%DATADIR%%/cdroot_site_overrides.sample +%%DATADIR%%/rc.replacement +@dirrm %%DATADIR%% Modified: head/sysutils/chgrep/Makefile ============================================================================== --- head/sysutils/chgrep/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/chgrep/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -13,14 +13,12 @@ COMMENT= Fast string substitution across GNU_CONFIGURE= yes USE_GMAKE= yes -MAN1= chgrep.1 -PLIST_FILES= bin/chgrep +PLIST_FILES= bin/chgrep man/man1/${PORTNAME}.1.gz -NO_STAGE= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/chgrep \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/chgrep.1 \ - ${MANPREFIX}/man/man1 + ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> Modified: head/sysutils/clonehdd/Makefile ============================================================================== --- head/sysutils/clonehdd/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/clonehdd/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -11,15 +11,11 @@ COMMENT= Tool for clone HDD on FreeBSD USES= perl5 USE_PERL5= run -PLIST_FILES= sbin/clonehdd +PLIST_FILES= sbin/clonehdd man/man8/${PORTNAME}.8.gz NO_BUILD= YES -MAN8= clonehdd.8 -SUB_FILES= pkg-message -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/clonehdd ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/clonehdd.8 ${MAN8PREFIX}/man/man8 - ${CAT} ${PKGMESSAGE} + ${INSTALL_SCRIPT} ${WRKSRC}/clonehdd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/clonehdd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include <bsd.port.mk> Added: head/sysutils/clonehdd/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/clonehdd/pkg-message Fri Nov 8 15:06:28 2013 (r333238) @@ -0,0 +1,9 @@ +---------------------------------------------------------------------- +## ATTENTION! ## ATTENTION! ## ATTENTION! ## + +This tool can damage your data if you will use it without +understanding how it works! +Please, run "man clonehdd" or read README file. + +All questions you can ask on http://sourceforge.net/projects/clonehdd +---------------------------------------------------------------------- Modified: head/sysutils/consolehm/Makefile ============================================================================== --- head/sysutils/consolehm/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/consolehm/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -14,11 +14,8 @@ COMMENT= Console based hardware monitor WRKSRC= ${WRKDIR}/consolehm/consolehm GNU_CONFIGURE= yes -MAN8= chm.8 -MANCOMPRESSED= yes -PLIST_FILES= bin/chm +PLIST_FILES= bin/chm man/man8/chm.8.gz -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" Modified: head/sysutils/cotty/Makefile ============================================================================== --- head/sysutils/cotty/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cotty/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -16,11 +16,10 @@ EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= > ${WRKSRC}/${DISTNAME}.c -NO_STAGE= yes do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/cotty ${WRKSRC}/${DISTNAME}.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cotty ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/cotty ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/cw/Makefile ============================================================================== --- head/sysutils/cw/Makefile Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cw/Makefile Fri Nov 8 15:06:28 2013 (r333238) @@ -12,20 +12,15 @@ COMMENT= Non-intrusive color wrapper for GNU_CONFIGURE= yes -MANCOMPRESSED= yes -MAN1= cw.1 cwe.1 cwu.1 - OPTIONS_DEFINE= DOCS -PORTDOCS= * -NO_STAGE= yes .include <bsd.port.options.mk> post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} . for file in CHANGES CONTRIB FILES INSTALL PLATFORM README VERSION - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} . endfor .endif Added: head/sysutils/cw/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cw/files/patch-Makefile.in Fri Nov 8 15:06:28 2013 (r333238) @@ -0,0 +1,9 @@ +--- Makefile.in.orig 2013-11-08 22:45:17.000000000 +0800 ++++ Makefile.in 2013-11-08 22:46:17.000000000 +0800 +@@ -1,5 +1,5 @@ + # this was NOT generated by automake. +-PREFIX=@prefix@ ++PREFIX=${DESTDIR}@prefix@ + BINDIR=${PREFIX}/bin + LIBDIR=${PREFIX}/lib + MANDIR=@mandir@ Modified: head/sysutils/cw/pkg-plist ============================================================================== --- head/sysutils/cw/pkg-plist Fri Nov 8 14:54:21 2013 (r333237) +++ head/sysutils/cw/pkg-plist Fri Nov 8 15:06:28 2013 (r333238) @@ -121,5 +121,13 @@ lib/cw/wc lib/cw/whereis lib/cw/who lib/cw/xferlog@ +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/CONTRIB +%%PORTDOCS%%%%DOCSDIR%%/FILES +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/PLATFORM +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/VERSION +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/cw/etc @dirrm lib/cw
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311081506.rA8F6T0p028721>