svn commit: r329478 - in head: mail/clawsker mail/libetpan multimedia/smtube polish/ekg polish/ekg2 polish/qnapi sysutils/gsmartcontrol sysutils/gsmartcontrol/files sysutils/lookat sysutils/ncdu x1...
Pawel Pekala
pawel at FreeBSD.org
Sat Oct 5 16:52:17 UTC 2013
Author: pawel
Date: Sat Oct 5 16:52:12 2013
New Revision: 329478
URL: http://svnweb.freebsd.org/changeset/ports/329478
Log:
Add support for STAGEDIR
Deleted:
head/sysutils/gsmartcontrol/files/
Modified:
head/mail/clawsker/Makefile
head/mail/clawsker/pkg-plist
head/mail/libetpan/Makefile
head/multimedia/smtube/Makefile
head/polish/ekg/Makefile
head/polish/ekg/pkg-plist (contents, props changed)
head/polish/ekg2/Makefile
head/polish/qnapi/Makefile
head/polish/qnapi/pkg-plist (contents, props changed)
head/sysutils/gsmartcontrol/Makefile
head/sysutils/gsmartcontrol/pkg-plist (contents, props changed)
head/sysutils/lookat/Makefile
head/sysutils/lookat/pkg-plist (contents, props changed)
head/sysutils/ncdu/Makefile
head/x11-fonts/freefont-ttf/Makefile (contents, props changed)
head/x11-themes/lxappearance/Makefile
head/x11-themes/lxappearance/pkg-plist
head/x11-toolkits/c++-gtk-utils/Makefile
head/x11-toolkits/termit/Makefile
head/x11-toolkits/termit/pkg-plist (contents, props changed)
Modified: head/mail/clawsker/Makefile
==============================================================================
--- head/mail/clawsker/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/mail/clawsker/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -18,7 +18,6 @@ RUN_DEPENDS= claws-mail>=3.9.1:${PORTSDI
USES= shebangfix perl5
SHEBANG_FILES= ${PORTNAME}
-MAN1= clawsker.1
PORTDOCS= NEWS README
OPTIONS_DEFINE= DOCS NLS
@@ -26,7 +25,6 @@ OPTIONS_SUB= yes
NLS_USES= gettext
-NO_STAGE= yes
.include <bsd.port.options.mk>
post-patch:
@@ -36,10 +34,7 @@ post-patch:
.endif
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|g} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/mail/clawsker/pkg-plist
==============================================================================
--- head/mail/clawsker/pkg-plist Sat Oct 5 16:51:41 2013 (r329477)
+++ head/mail/clawsker/pkg-plist Sat Oct 5 16:52:12 2013 (r329478)
@@ -1,4 +1,5 @@
bin/clawsker
+man/man1/clawsker.1.gz
%%NLS%%share/locale/fr/LC_MESSAGES/clawsker.mo
%%NLS%%share/locale/es/LC_MESSAGES/clawsker.mo
%%NLS%%share/locale/id/LC_MESSAGES/clawsker.mo
Modified: head/mail/libetpan/Makefile
==============================================================================
--- head/mail/libetpan/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/mail/libetpan/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -37,7 +37,6 @@ IPV6_CONFIGURE_ENABLE= ipv6
OPENSSL_CONFIGURE_ON= --without-gnutls
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MOPENSSL}
Modified: head/multimedia/smtube/Makefile
==============================================================================
--- head/multimedia/smtube/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/multimedia/smtube/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -22,22 +22,13 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKEFLAGS}|' \
-e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \
-e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
-e 's|$$(PREFIX)/share/smtube|${DATADIR}|g' \
+ -e 's|$$(PREFIX)/share/doc/smtube|${DOCSDIR}|' \
-e 's| make| ${GMAKE}|' \
${WRKSRC}/Makefile
-.if ${PORT_OPTIONS:MDOCS}
- @${REINPLACE_CMD} -e 's|$$(PREFIX)/share/doc/smtube|${DOCSDIR}|' \
- ${WRKSRC}/Makefile
-.else
- @${REINPLACE_CMD} -e '/DOC_PATH/d' ${WRKSRC}/Makefile
-.endif
-
.include <bsd.port.mk>
Modified: head/polish/ekg/Makefile
==============================================================================
--- head/polish/ekg/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/polish/ekg/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -25,10 +25,6 @@ CONFIGURE_ARGS= --without-libungif \
CFLAGS+= -I/usr/include -I${LOCALBASE}/include
LDFLAGS+= -L/usr/lib -lncurses -L${LOCALBASE}/lib -lexecinfo -pthread
-MAN1= ekg.1
-MANLANG= "" pl
-MANCOMPRESSED= no
-
OPTIONS_DEFINE= ASPELL OPENSSL
OPTIONS_DEFAULT= OPENSSL
@@ -37,8 +33,7 @@ ASPELL_LIB_DEPENDS= libaspell.so:${PORTS
OPENSSL_CONFIGURE_OFF= --without-openssl
-NO_STAGE= yes
post-install:
- ${STRIP_CMD} ${PREFIX}/bin/ekg
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ekg
.include <bsd.port.mk>
Modified: head/polish/ekg/pkg-plist
==============================================================================
--- head/polish/ekg/pkg-plist Sat Oct 5 16:51:41 2013 (r329477)
+++ head/polish/ekg/pkg-plist Sat Oct 5 16:52:12 2013 (r329478)
@@ -1,4 +1,6 @@
bin/ekg
+man/man1/ekg.1.gz
+man/pl/man1/ekg.1.gz
%%DATADIR%%/themes/arim.theme
%%DATADIR%%/themes/dj.theme
%%DATADIR%%/themes/eileen.theme
Modified: head/polish/ekg2/Makefile
==============================================================================
--- head/polish/ekg2/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/polish/ekg2/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -87,7 +87,6 @@ XOSD_CONFIGURE_ON= --with-libxosd
XOSD_CONFIGURE_OFF= --without-libxosd
XOSD_LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGTK2}
Modified: head/polish/qnapi/Makefile
==============================================================================
--- head/polish/qnapi/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/polish/qnapi/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -16,18 +16,14 @@ RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7
USE_QT4= corelib gui network xml qmake_build moc_build uic_build rcc_build
USE_KDE4= kdehier
-QMAKE_ARGS= PREFIX=${PREFIX} KDE4_PREFIX=${KDE4_PREFIX}
+PLIST_SUB= KDE4=${KDE4_PREFIX:S|${LOCALBASE}/||}
+QMAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} KDE4_PREFIX=${STAGEDIR}${KDE4_PREFIX}
INSTALLS_ICONS= yes
-MAN1= qnapi.1
-MANCOMPRESSED= yes
PORTDOCS= ChangeLog README.pl COPYRIGHT
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} 's|/usr/share/icons/||g' \
${WRKSRC}/doc/qnapi.desktop \
@@ -38,11 +34,7 @@ pre-build:
@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} ${QMAKEFLAGS} ${QMAKE_ARGS}
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
-.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|g} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/polish/qnapi/pkg-plist
==============================================================================
--- head/polish/qnapi/pkg-plist Sat Oct 5 16:51:41 2013 (r329477)
+++ head/polish/qnapi/pkg-plist Sat Oct 5 16:52:12 2013 (r329478)
@@ -1,14 +1,14 @@
bin/qnapi
-share/icons/qnapi.png
-share/icons/qnapi-48.png
-share/icons/qnapi-128.png
-share/icons/qnapi-512.png
+%%KDE4%%/share/kde4/services/ServiceMenus/qnapi-download.desktop
+man/man1/qnapi.1.gz
share/applications/qnapi.desktop
share/apps/konqueror/servicemenus/qnapi-download.desktop
+share/icons/qnapi-128.png
+share/icons/qnapi-48.png
+share/icons/qnapi-512.png
+share/icons/qnapi.png
+ at dirrmtry share/icons
@dirrmtry share/apps/konqueror/servicemenus
@dirrmtry share/apps/konqueror
@dirrmtry share/apps
@dirrmtry share/applications
- at dirrmtry share/icons
- at cwd %%KDE4_PREFIX%%
-share/kde4/services/ServiceMenus/qnapi-download.desktop
Modified: head/sysutils/gsmartcontrol/Makefile
==============================================================================
--- head/sysutils/gsmartcontrol/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/sysutils/gsmartcontrol/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -3,7 +3,7 @@
PORTNAME= gsmartcontrol
PORTVERSION= 0.8.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://artificialtime.com/${PORTNAME}/
@@ -19,18 +19,8 @@ USE_AUTOTOOLS= libtool
USES= pkgconfig
INSTALLS_ICONS= yes
-MAN1= gsmartcontrol.1
-
CONFIGURE_ARGS= --disable-libglade
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-post-patch:
-.if !${PORT_OPTIONS:MDOCS}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in
-.endif
-
.include <bsd.port.mk>
Modified: head/sysutils/gsmartcontrol/pkg-plist
==============================================================================
--- head/sysutils/gsmartcontrol/pkg-plist Sat Oct 5 16:51:41 2013 (r329477)
+++ head/sysutils/gsmartcontrol/pkg-plist Sat Oct 5 16:52:12 2013 (r329478)
@@ -1,5 +1,7 @@
bin/gsmartcontrol
bin/gsmartcontrol-root
+man/man1/gsmartcontrol.1.gz
+man/man1/gsmartcontrol-root.1.gz
share/applications/gsmartcontrol.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
Modified: head/sysutils/lookat/Makefile
==============================================================================
--- head/sysutils/lookat/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/sysutils/lookat/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -14,29 +14,20 @@ FETCH_ARGS= -Fpr
GNU_CONFIGURE= yes
USES= gmake
-MAN1= lookat.1
+PORTDOCS= README
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} 's|/etc/lookat.conf|${PREFIX}&|g' \
${WRKSRC}/${PORTNAME}.1
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/lookat ${PREFIX}/bin
- @${INSTALL_MAN} ${WRKSRC}/lookat.1 ${PREFIX}/man/man1
- @${INSTALL_DATA} ${WRKSRC}/lookat.conf.default \
- ${PREFIX}/etc/lookat.conf.sample
- @if [ ! -f ${PREFIX}/etc/lookat.conf ]; then \
- ${CP} -p ${PREFIX}/etc/lookat.conf.sample ${PREFIX}/etc/lookat.conf ; \
- fi
-
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+ ${INSTALL_PROGRAM} ${WRKSRC}/lookat ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/lookat.1 ${STAGEDIR}${PREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/lookat.conf.default \
+ ${STAGEDIR}${PREFIX}/etc/lookat.conf.sample
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/sysutils/lookat/pkg-plist
==============================================================================
--- head/sysutils/lookat/pkg-plist Sat Oct 5 16:51:41 2013 (r329477)
+++ head/sysutils/lookat/pkg-plist Sat Oct 5 16:52:12 2013 (r329478)
@@ -2,5 +2,4 @@ bin/lookat
@unexec if cmp -s %D/etc/lookat.conf.sample %D/etc/lookat.conf; then rm -f %D/etc/lookat.conf; fi
etc/lookat.conf.sample
@exec if [ ! -f %D/etc/lookat.conf ] ; then cp -p %D/%F %B/lookat.conf; fi
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+man/man1/lookat.1.gz
Modified: head/sysutils/ncdu/Makefile
==============================================================================
--- head/sysutils/ncdu/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/sysutils/ncdu/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -12,8 +12,7 @@ COMMENT= Ncurses du(1)
LICENSE= MIT
GNU_CONFIGURE= yes
-PLIST_FILES= bin/${PORTNAME}
-MAN1= ${PORTNAME}.1
+PLIST_FILES= bin/${PORTNAME} \
+ man/man1/${PORTNAME}.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11-fonts/freefont-ttf/Makefile
==============================================================================
--- head/x11-fonts/freefont-ttf/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/x11-fonts/freefont-ttf/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -18,24 +18,19 @@ LICENSE= GPLv3
USE_ZIP= yes
WRKSRC= ${WRKDIR}/freefont-${PORTVERSION}
-INSTALLDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME}
+INSTALLDIR= ${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
PORTDOCS= AUTHORS ChangeLog CREDITS README
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
do-build:
cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontscale
cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontdir
do-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
- ${MKDIR} ${INSTALLDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${INSTALLDIR}
cd ${WRKSRC} && \
${INSTALL_DATA} fonts.dir fonts.scale *.ttf ${INSTALLDIR}
Modified: head/x11-themes/lxappearance/Makefile
==============================================================================
--- head/x11-themes/lxappearance/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/x11-themes/lxappearance/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -16,8 +16,6 @@ GNU_CONFIGURE= yes
USES= gmake pkgconfig
USE_GNOME= gnomehack gtk20 intlhack
-MAN1= lxappearance.1
-
PORTDOCS= AUTHORS README
OPTIONS_DEFINE= DOCS NLS
@@ -25,7 +23,6 @@ OPTIONS_SUB= yes
NLS_USES= gettext
-NO_STAGE= yes
.include <bsd.port.options.mk>
post-patch:
@@ -35,9 +32,7 @@ post-patch:
.endif
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/x11-themes/lxappearance/pkg-plist
==============================================================================
--- head/x11-themes/lxappearance/pkg-plist Sat Oct 5 16:51:41 2013 (r329477)
+++ head/x11-themes/lxappearance/pkg-plist Sat Oct 5 16:52:12 2013 (r329478)
@@ -1,6 +1,7 @@
bin/lxappearance
include/lxappearance/lxappearance.h
libdata/pkgconfig/lxappearance.pc
+man/man1/lxappearance.1.gz
share/applications/lxappearance.desktop
%%NLS%%share/locale/ar/LC_MESSAGES/lxappearance.mo
%%NLS%%share/locale/be/LC_MESSAGES/lxappearance.mo
Modified: head/x11-toolkits/c++-gtk-utils/Makefile
==============================================================================
--- head/x11-toolkits/c++-gtk-utils/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/x11-toolkits/c++-gtk-utils/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -28,13 +28,4 @@ OPTIONS_DEFINE= DEBUG DOCS
DEBUG_CONFIGURE_ON= --enable-debug
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-post-configure:
-.if ! ${PORT_OPTIONS:MDOCS}
- @${REINPLACE_CMD} '/^SUBDIRS/ s|docs|| ; /^pkgdoc_DATA/d' \
- ${WRKSRC}/Makefile
-.endif
-
.include <bsd.port.mk>
Modified: head/x11-toolkits/termit/Makefile
==============================================================================
--- head/x11-toolkits/termit/Makefile Sat Oct 5 16:51:41 2013 (r329477)
+++ head/x11-toolkits/termit/Makefile Sat Oct 5 16:52:12 2013 (r329478)
@@ -19,9 +19,7 @@ USE_GNOME= gdkpixbuf2 vte
CFLAGS+= -I${LOCALBASE}/include/vte-0.0
-MAN1= ${PORTNAME}.1
-
-TERMIT_ETC= ${PREFIX}/etc/xdg/${PORTNAME}
+TERMIT_ETC= ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}
OPTIONS_DEFINE= DEBUG DOCS NLS
OPTIONS_SUB= yes
@@ -31,15 +29,9 @@ DEBUG_CMAKE_ON= -DDEBUG:BOOL=YES
NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=NO
NLS_USES= gettext
-NO_STAGE= yes
.include <bsd.port.options.mk>
post-patch:
-.if ${PORT_OPTIONS:MDOCS}
- @${REINPLACE_CMD} 's|../COPYING||' ${WRKSRC}/doc/CMakeLists.txt
-.else
- @${REINPLACE_CMD} '/TERMIT_DOCS/s|^|#|' ${WRKSRC}/doc/CMakeLists.txt
-.endif
@${REINPLACE_CMD} 's|share/man|man|' ${WRKSRC}/doc/CMakeLists.txt
@${REINPLACE_CMD} 's|ADD_SUBDIRECTORY(etc)||' ${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/src/lua_conf.c
@@ -47,12 +39,9 @@ post-patch:
${WRKSRC}/src/CMakeLists.txt
post-install:
- ${MKDIR} ${TERMIT_ETC}
+ @${MKDIR} ${TERMIT_ETC}
.for file in colormaps.lua rc.lua utils.lua
${CP} ${WRKSRC}/etc/termit/${file} ${TERMIT_ETC}/${file}.sample
- @if [ ! -f ${TERMIT_ETC}/${file} ]; then \
- ${CP} -p ${TERMIT_ETC}/${file}.sample ${TERMIT_ETC}/${file}; \
- fi
.endfor
.include <bsd.port.mk>
Modified: head/x11-toolkits/termit/pkg-plist
==============================================================================
--- head/x11-toolkits/termit/pkg-plist Sat Oct 5 16:51:41 2013 (r329477)
+++ head/x11-toolkits/termit/pkg-plist Sat Oct 5 16:52:12 2013 (r329478)
@@ -8,6 +8,7 @@ etc/xdg/termit/rc.lua.sample
@unexec if cmp -s %D/etc/xdg/termit/utils.lua.sample %D/etc/xdg/termit/utils.lua; then rm -f %D/etc/xdg/termit/utils.lua; fi
etc/xdg/termit/utils.lua.sample
@exec if [ ! -f %D/etc/xdg/termit/utils.lua ] ; then cp -p %D/%F %B/utils.lua; fi
+man/man1/termit.1.gz
share/applications/termit.desktop
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/lua_api.txt
More information about the svn-ports-all
mailing list