Index: head/x11-wm/scrotwm/Makefile =================================================================== --- head/x11-wm/scrotwm/Makefile (revision 290838) +++ head/x11-wm/scrotwm/Makefile (revision 290839) @@ -1,64 +1,68 @@ # New ports collection makefile for: scrotwm # Date created: June 29, 2009 # Whom: Aragon Gouveia # # $FreeBSD$ # 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 MAINTAINER= zeising@daemonic.se COMMENT= A small, dynamic tiling window manager for X11 LICENSE= ISCL OPTIONS= DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off .include 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 .if defined(WITH_DMENU_BOTTOM) EXTRA_PATCHES+= ${FILESDIR}/spawn_menu_atbottom.patch .endif post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.* do-build: ${CC} ${CFLAGS} -I${LOCALBASE}/include \ -I${WRKSRC}/freebsd -lutil -L${LOCALBASE}/lib -lX11 -lXrandr \ -lXtst -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \ -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c ${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \ -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 Property changes on: head/x11-wm/scrotwm/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/x11-wm/scrotwm/distinfo =================================================================== --- head/x11-wm/scrotwm/distinfo (revision 290838) +++ head/x11-wm/scrotwm/distinfo (revision 290839) @@ -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 Property changes on: head/x11-wm/scrotwm/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/x11-wm/scrotwm/pkg-plist =================================================================== --- head/x11-wm/scrotwm/pkg-plist (revision 290838) +++ head/x11-wm/scrotwm/pkg-plist (revision 290839) @@ -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%% Property changes on: head/x11-wm/scrotwm/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/x11-wm/spectrwm/Makefile =================================================================== --- head/x11-wm/spectrwm/Makefile (revision 290838) +++ head/x11-wm/spectrwm/Makefile (revision 290839) @@ -1,64 +1,68 @@ # New ports collection makefile for: scrotwm # Date created: June 29, 2009 # Whom: Aragon Gouveia # # $FreeBSD$ # 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 MAINTAINER= zeising@daemonic.se COMMENT= A small, dynamic tiling window manager for X11 LICENSE= ISCL OPTIONS= DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off .include 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 .if defined(WITH_DMENU_BOTTOM) EXTRA_PATCHES+= ${FILESDIR}/spawn_menu_atbottom.patch .endif post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.* do-build: ${CC} ${CFLAGS} -I${LOCALBASE}/include \ -I${WRKSRC}/freebsd -lutil -L${LOCALBASE}/lib -lX11 -lXrandr \ -lXtst -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \ -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c ${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \ -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 Property changes on: head/x11-wm/spectrwm/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/x11-wm/spectrwm/distinfo =================================================================== --- head/x11-wm/spectrwm/distinfo (revision 290838) +++ head/x11-wm/spectrwm/distinfo (revision 290839) @@ -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 Property changes on: head/x11-wm/spectrwm/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/x11-wm/spectrwm/pkg-plist =================================================================== --- head/x11-wm/spectrwm/pkg-plist (revision 290838) +++ head/x11-wm/spectrwm/pkg-plist (revision 290839) @@ -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%% Property changes on: head/x11-wm/spectrwm/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property