diff options
author | Jason Helfman <jgh@FreeBSD.org> | 2012-02-10 08:16:33 +0000 |
---|---|---|
committer | Jason Helfman <jgh@FreeBSD.org> | 2012-02-10 08:16:33 +0000 |
commit | 45784bc4ff777ef192dbb6e3161507f331621bee (patch) | |
tree | 748c941763ddff0beeece712ddcf8ff7ac9145d1 /x11-wm | |
parent | 70de555f3236ede593b4f03cf4a02c4572867bf8 (diff) |
Notes
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/scrotwm/Makefile | 28 | ||||
-rw-r--r-- | x11-wm/scrotwm/distinfo | 4 | ||||
-rw-r--r-- | x11-wm/scrotwm/pkg-plist | 9 | ||||
-rw-r--r-- | x11-wm/spectrwm/Makefile | 28 | ||||
-rw-r--r-- | x11-wm/spectrwm/distinfo | 4 | ||||
-rw-r--r-- | x11-wm/spectrwm/pkg-plist | 9 |
6 files changed, 38 insertions, 44 deletions
diff --git a/x11-wm/scrotwm/Makefile b/x11-wm/scrotwm/Makefile index 5f48dddf2ecb..d5a7073279dc 100644 --- a/x11-wm/scrotwm/Makefile +++ b/x11-wm/scrotwm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= scrotwm -PORTVERSION= 0.10.0 -PORTREVISION= 1 +PORTVERSION= 0.11.0 CATEGORIES= x11-wm MASTER_SITES= https://opensource.conformal.com/snapshots/scrotwm/ EXTRACT_SUFX= .tgz @@ -25,6 +24,12 @@ USE_XORG= x11 xproto xrandr xt xtst MAN1= scrotwm.1 USE_LDCONFIG=yes +PORTEXAMPLES= scrotwm_cz.conf \ + scrotwm_es.conf \ + scrotwm_fr.conf \ + scrotwm_fr_ch.conf \ + scrotwm_se.conf \ + scrotwm_us.conf RUN_DEPENDS+= dmenu:${PORTSDIR}/x11/dmenu @@ -44,21 +49,20 @@ do-build: -o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c do-install: - ${MKDIR} ${EXAMPLESDIR} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${PREFIX}/lib - ${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${MAN1PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/etc/scrotwm.conf.sample @if [ ! -f ${PREFIX}/etc/scrotwm.conf ]; then \ - ${CP} -p ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \ + ${INSTALL_DATA} ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \ fi ${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_cz.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_es.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_fr.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_fr_ch.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_se.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_us.conf ${EXAMPLESDIR} +.if !defined(NOPORTEXAMPLES) + ${MKDIR} ${EXAMPLESDIR} +.for conf in ${PORTEXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/${conf} ${EXAMPLESDIR} +.endfor +.endif .include <bsd.port.post.mk> diff --git a/x11-wm/scrotwm/distinfo b/x11-wm/scrotwm/distinfo index 921c90b87750..aa051b62c30f 100644 --- a/x11-wm/scrotwm/distinfo +++ b/x11-wm/scrotwm/distinfo @@ -1,2 +1,2 @@ -SHA256 (scrotwm-0.10.0.tgz) = 4219beaa2f0dcb6bb8e80180d03bbf3ad58daaff627de189f0b7641b1faf7222 -SIZE (scrotwm-0.10.0.tgz) = 80960 +SHA256 (scrotwm-0.11.0.tgz) = 7d2a5b30c6285ee2daead904b6dd6b89c4f2ca7ac64aac88213151e234c6554d +SIZE (scrotwm-0.11.0.tgz) = 82600 diff --git a/x11-wm/scrotwm/pkg-plist b/x11-wm/scrotwm/pkg-plist index 67d82d9889c1..58d1d161c1a5 100644 --- a/x11-wm/scrotwm/pkg-plist +++ b/x11-wm/scrotwm/pkg-plist @@ -1,14 +1,7 @@ bin/scrotwm +bin/screenshot.sh bin/startscrotwm lib/libswmhack.so -%%EXAMPLESDIR%%/screenshot.sh -%%EXAMPLESDIR%%/scrotwm_cz.conf -%%EXAMPLESDIR%%/scrotwm_es.conf -%%EXAMPLESDIR%%/scrotwm_fr.conf -%%EXAMPLESDIR%%/scrotwm_fr_ch.conf -%%EXAMPLESDIR%%/scrotwm_se.conf -%%EXAMPLESDIR%%/scrotwm_us.conf @unexec if [ ! -f %D/etc/scrotwm.conf ] || cmp -s %D/etc/scrotwm.conf.sample %D/etc/scrotwm.conf; then rm -f %D/etc/scrotwm.conf; else echo %%PREFIX%%/etc/scrotwm.conf contains changes, remove it manually to delete this package completely.; fi etc/scrotwm.conf.sample @exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf -@dirrm %%EXAMPLESDIR%% diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile index 5f48dddf2ecb..d5a7073279dc 100644 --- a/x11-wm/spectrwm/Makefile +++ b/x11-wm/spectrwm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= scrotwm -PORTVERSION= 0.10.0 -PORTREVISION= 1 +PORTVERSION= 0.11.0 CATEGORIES= x11-wm MASTER_SITES= https://opensource.conformal.com/snapshots/scrotwm/ EXTRACT_SUFX= .tgz @@ -25,6 +24,12 @@ USE_XORG= x11 xproto xrandr xt xtst MAN1= scrotwm.1 USE_LDCONFIG=yes +PORTEXAMPLES= scrotwm_cz.conf \ + scrotwm_es.conf \ + scrotwm_fr.conf \ + scrotwm_fr_ch.conf \ + scrotwm_se.conf \ + scrotwm_us.conf RUN_DEPENDS+= dmenu:${PORTSDIR}/x11/dmenu @@ -44,21 +49,20 @@ do-build: -o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c do-install: - ${MKDIR} ${EXAMPLESDIR} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${PREFIX}/lib - ${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${MAN1PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/etc/scrotwm.conf.sample @if [ ! -f ${PREFIX}/etc/scrotwm.conf ]; then \ - ${CP} -p ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \ + ${INSTALL_DATA} ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \ fi ${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_cz.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_es.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_fr.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_fr_ch.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_se.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/scrotwm_us.conf ${EXAMPLESDIR} +.if !defined(NOPORTEXAMPLES) + ${MKDIR} ${EXAMPLESDIR} +.for conf in ${PORTEXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/${conf} ${EXAMPLESDIR} +.endfor +.endif .include <bsd.port.post.mk> diff --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo index 921c90b87750..aa051b62c30f 100644 --- a/x11-wm/spectrwm/distinfo +++ b/x11-wm/spectrwm/distinfo @@ -1,2 +1,2 @@ -SHA256 (scrotwm-0.10.0.tgz) = 4219beaa2f0dcb6bb8e80180d03bbf3ad58daaff627de189f0b7641b1faf7222 -SIZE (scrotwm-0.10.0.tgz) = 80960 +SHA256 (scrotwm-0.11.0.tgz) = 7d2a5b30c6285ee2daead904b6dd6b89c4f2ca7ac64aac88213151e234c6554d +SIZE (scrotwm-0.11.0.tgz) = 82600 diff --git a/x11-wm/spectrwm/pkg-plist b/x11-wm/spectrwm/pkg-plist index 67d82d9889c1..58d1d161c1a5 100644 --- a/x11-wm/spectrwm/pkg-plist +++ b/x11-wm/spectrwm/pkg-plist @@ -1,14 +1,7 @@ bin/scrotwm +bin/screenshot.sh bin/startscrotwm lib/libswmhack.so -%%EXAMPLESDIR%%/screenshot.sh -%%EXAMPLESDIR%%/scrotwm_cz.conf -%%EXAMPLESDIR%%/scrotwm_es.conf -%%EXAMPLESDIR%%/scrotwm_fr.conf -%%EXAMPLESDIR%%/scrotwm_fr_ch.conf -%%EXAMPLESDIR%%/scrotwm_se.conf -%%EXAMPLESDIR%%/scrotwm_us.conf @unexec if [ ! -f %D/etc/scrotwm.conf ] || cmp -s %D/etc/scrotwm.conf.sample %D/etc/scrotwm.conf; then rm -f %D/etc/scrotwm.conf; else echo %%PREFIX%%/etc/scrotwm.conf contains changes, remove it manually to delete this package completely.; fi etc/scrotwm.conf.sample @exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf -@dirrm %%EXAMPLESDIR%% |