Date: Thu, 27 Feb 2014 15:22:42 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346366 - in head/ports-mgmt: portshaker portshaker-config portshaker/files Message-ID: <201402271522.s1RFMg5d019555@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Feb 27 15:22:42 2014 New Revision: 346366 URL: http://svnweb.freebsd.org/changeset/ports/346366 QAT: https://qat.redports.org/buildarchive/r346366/ Log: - Convert to staging - Have portshaker-config not overwrite the config file. Sponsored by: Absolight Added: head/ports-mgmt/portshaker/files/ head/ports-mgmt/portshaker/files/patch-Makefile (contents, props changed) Modified: head/ports-mgmt/portshaker-config/Makefile head/ports-mgmt/portshaker-config/pkg-plist head/ports-mgmt/portshaker/Makefile head/ports-mgmt/portshaker/pkg-plist Modified: head/ports-mgmt/portshaker-config/Makefile ============================================================================== --- head/ports-mgmt/portshaker-config/Makefile Thu Feb 27 15:20:53 2014 (r346365) +++ head/ports-mgmt/portshaker-config/Makefile Thu Feb 27 15:22:42 2014 (r346366) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= portshaker-config +PORTREVISION= 1 CATEGORIES= ports-mgmt MAINTAINER= romain@FreeBSD.org @@ -16,5 +17,11 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/portshaker.d + +post-install: + @${MV} ${STAGEDIR}${PREFIX}/etc/portshaker.conf \ + ${STAGEDIR}${PREFIX}/etc/portshaker.conf.sample-config + .include "${MASTERDIR}/Makefile" Modified: head/ports-mgmt/portshaker-config/pkg-plist ============================================================================== --- head/ports-mgmt/portshaker-config/pkg-plist Thu Feb 27 15:20:53 2014 (r346365) +++ head/ports-mgmt/portshaker-config/pkg-plist Thu Feb 27 15:22:42 2014 (r346366) @@ -1,4 +1,6 @@ -etc/portshaker.conf +@unexec if cmp -s %D/etc/portshaker.conf.sample-config %D/etc/portshaker.conf; then rm -f %D/etc/portshaker.conf; fi +etc/portshaker.conf.sample-config +@exec if [ ! -f %D/etc/portshaker.conf ] ; then cp -p %D/%F %B/portshaker.conf; fi etc/portshaker.d/bsd_sharp etc/portshaker.d/bsd_sharp_releng_2_0 etc/portshaker.d/bsd_sharp_releng_2_2 Modified: head/ports-mgmt/portshaker/Makefile ============================================================================== --- head/ports-mgmt/portshaker/Makefile Thu Feb 27 15:20:53 2014 (r346365) +++ head/ports-mgmt/portshaker/Makefile Thu Feb 27 15:22:42 2014 (r346366) @@ -22,9 +22,10 @@ OPTIONS_DEFAULT= RSYNC SVN RSYNC_DESC= rsync support GIT_DESC= git support HG_DESC= mercurial support -MAN5= portshaker.conf.5 \ - portshaker.d.5 -MAN8= portshaker.8 +RSYNC_RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync +SVN_RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion +GIT_RUN_DEPENDS= git:${PORTSDIR}/devel/git +HG_RUN_DEPENDS= hg:${PORTSDIR}/devel/mercurial .else OPTIONS_DEFINE= BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG OPTIONS_DEFAULT= BSDSHARP @@ -35,50 +36,13 @@ HASKELL_DESC= Enable Haskell ports MARCUSCOM_DESC= Enable GNOME development ports TEXLIVE_DESC= Enable TeXLive ports (Experimental) XORG_DESC= Enable Xorg development ports -.endif - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORTNAME} == "portshaker" - -. if ${PORT_OPTIONS:MRSYNC} -RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync -. endif -. if ${PORT_OPTIONS:MSVN} -RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion -. endif -. if ${PORT_OPTIONS:MGIT} -RUN_DEPENDS+= git:${PORTSDIR}/devel/git -. endif -. if ${PORT_OPTIONS:MHG} -RUN_DEPENDS+= hg:${PORTSDIR}/devel/mercurial -. endif - -.else - -. if ${PORT_OPTIONS:MBSDSHARP} -MAKE_ENV+= WITH_BSDSHARP=1 -. endif -. if ${PORT_OPTIONS:MENLIGHTENMENT} -MAKE_ENV+= WITH_ENLIGHTENMENT=1 -. endif -. if ${PORT_OPTIONS:MGECKO} -MAKE_ENV+= WITH_GECKO=1 -. endif -. if ${PORT_OPTIONS:MHASKELL} -MAKE_ENV+= WITH_HASKELL=1 -. endif -. if ${PORT_OPTIONS:MMARCUSCOM} -MAKE_ENV+= WITH_MARCUSCOM=1 -. endif -. if ${PORT_OPTIONS:MTEXLIVE} -MAKE_ENV+= WITH_TEXLIVE=1 -. endif -. if ${PORT_OPTIONS:MXORG} -MAKE_ENV+= WITH_XORG=1 -. endif - +BSDSHARP_MAKE_ENV= WITH_BSDSHARP=1 +ENLIGHTENMENT_MAKE_ENV= WITH_ENLIGHTENMENT=1 +GECKO_MAKE_ENV= WITH_GECKO=1 +HASKELL_MAKE_ENV= WITH_HASKELL=1 +MARCUSCOM_MAKE_ENV= WITH_MARCUSCOM=1 +TEXLIVE_MAKE_ENV= WITH_TEXLIVE=1 +XORG_MAKE_ENV= WITH_XORG=1 .endif .include <bsd.port.mk> Added: head/ports-mgmt/portshaker/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/portshaker/files/patch-Makefile Thu Feb 27 15:22:42 2014 (r346366) @@ -0,0 +1,13 @@ +--- ./Makefile.orig 2014-01-17 20:30:31.000000000 +0100 ++++ ./Makefile 2014-02-27 16:03:26.000000000 +0100 +@@ -30,8 +30,8 @@ + > ${.TARGET} + + beforeinstall: +- if [ ! -d "${SHAREDIR}/portshaker" ]; then mkdir -p "${SHAREDIR}/portshaker"; fi +- if [ ! -d "${ETCDIR}/portshaker.d" ]; then mkdir -p "${ETCDIR}/portshaker.d"; fi ++ if [ ! -d "${DESTDIR}${SHAREDIR}/portshaker" ]; then mkdir -p "${DESTDIR}${SHAREDIR}/portshaker"; fi ++ if [ ! -d "${DESTDIR}${ETCDIR}/portshaker.d" ]; then mkdir -p "${DESTDIR}${ETCDIR}/portshaker.d"; fi + + tarball: + git archive -o ${TARBALL} v${VERSION} Modified: head/ports-mgmt/portshaker/pkg-plist ============================================================================== --- head/ports-mgmt/portshaker/pkg-plist Thu Feb 27 15:20:53 2014 (r346365) +++ head/ports-mgmt/portshaker/pkg-plist Thu Feb 27 15:22:42 2014 (r346366) @@ -1,5 +1,8 @@ bin/portshaker etc/portshaker.conf.sample +man/man5/portshaker.conf.5.gz +man/man5/portshaker.d.5.gz +man/man8/portshaker.8.gz %%DATADIR%%/merge-updating.awk %%DATADIR%%/portshaker.subr @exec mkdir -p %D/etc/portshaker.d
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402271522.s1RFMg5d019555>