Date: Wed, 23 Oct 2013 19:36:17 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331418 - in head: x11-clocks/lmclock x11-themes/audacious-skins x11/gtk-launch x11/thinglaunch x11/xterm Message-ID: <201310231936.r9NJaHdt015706@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Wed Oct 23 19:36:17 2013 New Revision: 331418 URL: http://svnweb.freebsd.org/changeset/ports/331418 Log: Support staging. Modified: head/x11-clocks/lmclock/Makefile head/x11-themes/audacious-skins/Makefile head/x11/gtk-launch/Makefile head/x11/thinglaunch/Makefile head/x11/xterm/Makefile head/x11/xterm/pkg-plist Modified: head/x11-clocks/lmclock/Makefile ============================================================================== --- head/x11-clocks/lmclock/Makefile Wed Oct 23 19:21:58 2013 (r331417) +++ head/x11-clocks/lmclock/Makefile Wed Oct 23 19:36:17 2013 (r331418) @@ -15,11 +15,10 @@ USE_XORG= x11 xext PLIST_FILES= bin/lmclock -NO_STAGE= yes post-extract: @${TOUCH} ${WRKSRC}/lmclock.man do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/x11-themes/audacious-skins/Makefile ============================================================================== --- head/x11-themes/audacious-skins/Makefile Wed Oct 23 19:21:58 2013 (r331417) +++ head/x11-themes/audacious-skins/Makefile Wed Oct 23 19:36:17 2013 (r331418) @@ -16,9 +16,8 @@ NO_BUILD= yes DATADIR= ${PREFIX}/share/audacious -NO_STAGE= yes do-install: - ${MKDIR} ${DATADIR}/Skins - ${INSTALL_DATA} ${WRKSRC}/Skins/*/*.wsz ${DATADIR}/Skins + ${MKDIR} ${STAGEDIR}${DATADIR}/Skins + ${INSTALL_DATA} ${WRKSRC}/Skins/*/*.wsz ${STAGEDIR}${DATADIR}/Skins .include <bsd.port.mk> Modified: head/x11/gtk-launch/Makefile ============================================================================== --- head/x11/gtk-launch/Makefile Wed Oct 23 19:21:58 2013 (r331417) +++ head/x11/gtk-launch/Makefile Wed Oct 23 19:36:17 2013 (r331418) @@ -20,7 +20,6 @@ PORTSCOUT= skipv:1.1 OPTIONS_DEFINE=DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -31,11 +30,11 @@ do-build: -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/launch.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif post-install: Modified: head/x11/thinglaunch/Makefile ============================================================================== --- head/x11/thinglaunch/Makefile Wed Oct 23 19:21:58 2013 (r331417) +++ head/x11/thinglaunch/Makefile Wed Oct 23 19:36:17 2013 (r331418) @@ -16,12 +16,11 @@ LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/thinglaunch -NO_STAGE= yes do-build: ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c \ -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/x11/xterm/Makefile ============================================================================== --- head/x11/xterm/Makefile Wed Oct 23 19:21:58 2013 (r331417) +++ head/x11/xterm/Makefile Wed Oct 23 19:36:17 2013 (r331418) @@ -37,7 +37,6 @@ WCHAR_DESC= Enable wide-character suppor OPTIONS_DEFAULT=WCHAR LUIT 256COLOR -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:M256COLOR} @@ -77,8 +76,6 @@ PLIST_SUB+= GNOME="" PLIST_SUB+= GNOME="@comment " .endif -MAN1= resize.1 koi8rxterm.1 uxterm.1 xterm.1 - .include <bsd.port.pre.mk> .if ${OSVERSION} < 900004 @@ -91,9 +88,9 @@ post-extract: post-install: .for f in koi8rxterm resize uxterm xterm - @${CHMOD} ${BINMODE} ${PREFIX}/bin/${f} + @${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f} .endfor - @${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${STAGEDIR}${PREFIX}/share/applications/ .if ${PORT_OPTIONS:MGNOME} @-update-desktop-database .endif Modified: head/x11/xterm/pkg-plist ============================================================================== --- head/x11/xterm/pkg-plist Wed Oct 23 19:21:58 2013 (r331417) +++ head/x11/xterm/pkg-plist Wed Oct 23 19:36:17 2013 (r331418) @@ -8,6 +8,10 @@ lib/X11/app-defaults/UXTerm lib/X11/app-defaults/UXTerm-color lib/X11/app-defaults/XTerm lib/X11/app-defaults/XTerm-color +man/man1/resize.1.gz +man/man1/koi8rxterm.1.gz +man/man1/uxterm.1.gz +man/man1/xterm.1.gz share/applications/xterm.desktop share/pixmaps/filled-xterm_32x32.xpm share/pixmaps/filled-xterm_48x48.xpm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310231936.r9NJaHdt015706>