Date: Fri, 25 Oct 2013 06:28:14 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331558 - in head/astro: sscalc starplot stars sunclock wmjupiter wmmoonclock wmsun xeartk xphoon Message-ID: <201310250628.r9P6SEpM029194@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Oct 25 06:28:14 2013 New Revision: 331558 URL: http://svnweb.freebsd.org/changeset/ports/331558 Log: Support STAGEDIR. Modified: head/astro/sscalc/Makefile head/astro/sscalc/pkg-plist head/astro/starplot/Makefile head/astro/starplot/pkg-plist head/astro/stars/Makefile head/astro/sunclock/Makefile head/astro/sunclock/pkg-plist head/astro/wmjupiter/Makefile head/astro/wmmoonclock/Makefile head/astro/wmsun/Makefile head/astro/xeartk/Makefile head/astro/xphoon/Makefile Modified: head/astro/sscalc/Makefile ============================================================================== --- head/astro/sscalc/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/sscalc/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -9,9 +9,6 @@ MASTER_SITES= http://www.icehouse.net/ke MAINTAINER= ports@FreeBSD.org COMMENT= Sunrise and sunset time calculator -MAN1= sscalc.1 -NO_STAGE= yes - .include <bsd.port.options.mk> pre-fetch: @@ -22,12 +19,12 @@ pre-fetch: .endif do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sscalc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/sscalc.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sscalc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/sscalc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/cities.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/cities.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/astro/sscalc/pkg-plist ============================================================================== --- head/astro/sscalc/pkg-plist Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/sscalc/pkg-plist Fri Oct 25 06:28:14 2013 (r331558) @@ -1,4 +1,5 @@ bin/sscalc -%%PORTDOCS%%%%DOCSDIR%%/cities.txt +man/man1/sscalc.1.gz %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/cities.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/astro/starplot/Makefile ============================================================================== --- head/astro/starplot/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/starplot/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -10,14 +10,15 @@ MASTER_SITES= http://starplot.org/downlo MAINTAINER= ports@FreeBSD.org COMMENT= 3-dimensional viewer for star charts -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + USES= gmake pathfix gettext pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= starconvert.1 starpkg.1 starplot.1 +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e \ Modified: head/astro/starplot/pkg-plist ============================================================================== --- head/astro/starplot/pkg-plist Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/starplot/pkg-plist Fri Oct 25 06:28:14 2013 (r331558) @@ -1,55 +1,58 @@ bin/starconvert bin/starpkg bin/starplot +man/man1/starconvert.1.gz +man/man1/starpkg.1.gz +man/man1/starplot.1.gz share/applications/starplot.desktop -%%DOCSDIR%%/html/ch0.html -%%DOCSDIR%%/html/ch1.html -%%DOCSDIR%%/html/ch2.html -%%DOCSDIR%%/html/ch3.html -%%DOCSDIR%%/html/ch4.html -%%DOCSDIR%%/html/ch5.html -%%DOCSDIR%%/html/images/bayerdes.png -%%DOCSDIR%%/html/images/button-brighter.png -%%DOCSDIR%%/html/images/button-ccw.png -%%DOCSDIR%%/html/images/button-cw.png -%%DOCSDIR%%/html/images/button-dimmer.png -%%DOCSDIR%%/html/images/button-down.png -%%DOCSDIR%%/html/images/button-earthview.png -%%DOCSDIR%%/html/images/button-open.png -%%DOCSDIR%%/html/images/button-up.png -%%DOCSDIR%%/html/images/button-zoomin.png -%%DOCSDIR%%/html/images/button-zoomout.png -%%DOCSDIR%%/html/images/coords.png -%%DOCSDIR%%/html/images/dialog-define-chart.png -%%DOCSDIR%%/html/images/dialog-file-open.png -%%DOCSDIR%%/html/images/dialog-search.png -%%DOCSDIR%%/html/images/filebar.png -%%DOCSDIR%%/html/images/gcoords.png -%%DOCSDIR%%/html/images/hrdiagram.png -%%DOCSDIR%%/html/images/legend.png -%%DOCSDIR%%/html/images/menu-chart.png -%%DOCSDIR%%/html/images/menu-file.png -%%DOCSDIR%%/html/images/star-parts.png -%%DOCSDIR%%/html/images/star-popup.png -%%DOCSDIR%%/html/images/starplot-png.png -%%DOCSDIR%%/html/images/status.png -%%DOCSDIR%%/html/images/tour-40ly-reddwarfs.png -%%DOCSDIR%%/html/images/tour-40ly.png -%%DOCSDIR%%/html/images/tour-arcturus.png -%%DOCSDIR%%/html/images/tour-first.png -%%DOCSDIR%%/html/images/tour-galplane.png -%%DOCSDIR%%/html/images/tour-hr-diagram.png -%%DOCSDIR%%/html/images/tour-hyades.png -%%DOCSDIR%%/html/images/tour-legend-sun.png -%%DOCSDIR%%/html/images/tour-scocen.png -%%DOCSDIR%%/html/images/tour-sunlike-info.png -%%DOCSDIR%%/html/images/tour-sunlike.png -%%DOCSDIR%%/html/images/ui-parts.png -%%DOCSDIR%%/html/index.html -%%DOCSDIR%%/html/parfiles/galplane.par -%%DOCSDIR%%/html/parfiles/hyades.par -%%DOCSDIR%%/html/parfiles/scocen.par -%%DOCSDIR%%/html/starplot.css +%%PORTDOCS%%%%DOCSDIR%%/html/ch0.html +%%PORTDOCS%%%%DOCSDIR%%/html/ch1.html +%%PORTDOCS%%%%DOCSDIR%%/html/ch2.html +%%PORTDOCS%%%%DOCSDIR%%/html/ch3.html +%%PORTDOCS%%%%DOCSDIR%%/html/ch4.html +%%PORTDOCS%%%%DOCSDIR%%/html/ch5.html +%%PORTDOCS%%%%DOCSDIR%%/html/images/bayerdes.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-brighter.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-ccw.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-cw.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-dimmer.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-down.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-earthview.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-open.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-up.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-zoomin.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/button-zoomout.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/coords.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/dialog-define-chart.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/dialog-file-open.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/dialog-search.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/filebar.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/gcoords.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/hrdiagram.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/legend.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/menu-chart.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/menu-file.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/star-parts.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/star-popup.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/starplot-png.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/status.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-40ly-reddwarfs.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-40ly.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-arcturus.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-first.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-galplane.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-hr-diagram.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-hyades.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-legend-sun.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-scocen.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-sunlike-info.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/tour-sunlike.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/ui-parts.png +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/parfiles/galplane.par +%%PORTDOCS%%%%DOCSDIR%%/html/parfiles/hyades.par +%%PORTDOCS%%%%DOCSDIR%%/html/parfiles/scocen.par +%%PORTDOCS%%%%DOCSDIR%%/html/starplot.css %%EXAMPLESDIR%%/example.spec share/locale/en@boldquot/LC_MESSAGES/starplot.mo share/locale/en@quot/LC_MESSAGES/starplot.mo @@ -59,10 +62,10 @@ share/pixmaps/starplot32x32.xpm %%DATADIR%%/test.stars @dirrm %%DATADIR%% @dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%%/html/parfiles -@dirrm %%DOCSDIR%%/html/images -@dirrm %%DOCSDIR%%/html -@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/parfiles +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/locale/en@boldquot/LC_MESSAGES @dirrmtry share/locale/en@boldquot @dirrmtry share/locale/en@quot/LC_MESSAGES Modified: head/astro/stars/Makefile ============================================================================== --- head/astro/stars/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/stars/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -14,7 +14,6 @@ COMMENT= Star field demo PLIST_FILES= bin/stars WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XORG= x11 -NO_STAGE= yes do-build: @${CC} -I${PREFIX}/include ${CFLAGS} -c ${WRKSRC}/xwin.c -o ${WRKSRC}/xwin.o @@ -22,6 +21,6 @@ do-build: @${CC} ${WRKSRC}/main.o ${WRKSRC}/xwin.o -L${PREFIX}/lib -lX11 -lm -o ${WRKSRC}/stars do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/stars ${PREFIX}/bin/stars + ${INSTALL_PROGRAM} ${WRKSRC}/stars ${STAGEDIR}${PREFIX}/bin/stars .include <bsd.port.mk> Modified: head/astro/sunclock/Makefile ============================================================================== --- head/astro/sunclock/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/sunclock/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -16,7 +16,6 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/j USE_BZIP2= yes USE_XORG= xpm -NO_STAGE= yes CPPFLAGS+= $$(libpng-config --I_opts) \ -I${LOCALBASE}/include \ @@ -50,19 +49,19 @@ post-patch: 's|gzFile \* fd;|gzFile fd;|' ${WRKSRC}/readvmf.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sunclock ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sunclock.1 ${MANPREFIX}/man/man1 - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/Sunclockrc ${DATADIR} - @${MKDIR} ${DATADIR}/earthmaps/vmf - ${INSTALL_DATA} ${WRKSRC}/vmf/*.vmf ${DATADIR}/earthmaps/vmf - @${GZIP_CMD} ${DATADIR}/earthmaps/vmf/*.vmf - @${MKDIR} ${DATADIR}/i18n - ${INSTALL_DATA} ${WRKSRC}/i18n/Sunclock.?? ${DATADIR}/i18n - ${INSTALL_PROGRAM} ${WRKSRC}/editkit/emx ${PREFIX}/bin - @${MKDIR} ${DATADIR}/editkit - ${INSTALL_DATA} ${WRKSRC}/editkit/MANUAL.emacs ${DATADIR}/editkit - ${INSTALL_DATA} ${WRKSRC}/editkit/README ${DATADIR}/editkit - ${INSTALL_DATA} ${WRKSRC}/editkit/emxrc ${DATADIR}/editkit + ${INSTALL_PROGRAM} ${WRKSRC}/sunclock ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/sunclock.1 ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/Sunclockrc ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/earthmaps/vmf + ${INSTALL_DATA} ${WRKSRC}/vmf/*.vmf ${STAGEDIR}${DATADIR}/earthmaps/vmf + @${GZIP_CMD} ${STAGEDIR}${DATADIR}/earthmaps/vmf/*.vmf + @${MKDIR} ${STAGEDIR}${DATADIR}/i18n + ${INSTALL_DATA} ${WRKSRC}/i18n/Sunclock.?? ${STAGEDIR}${DATADIR}/i18n + ${INSTALL_PROGRAM} ${WRKSRC}/editkit/emx ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR}/editkit + ${INSTALL_DATA} ${WRKSRC}/editkit/MANUAL.emacs ${STAGEDIR}${DATADIR}/editkit + ${INSTALL_DATA} ${WRKSRC}/editkit/README ${STAGEDIR}${DATADIR}/editkit + ${INSTALL_DATA} ${WRKSRC}/editkit/emxrc ${STAGEDIR}${DATADIR}/editkit .include <bsd.port.mk> Modified: head/astro/sunclock/pkg-plist ============================================================================== --- head/astro/sunclock/pkg-plist Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/sunclock/pkg-plist Fri Oct 25 06:28:14 2013 (r331558) @@ -1,5 +1,6 @@ bin/emx bin/sunclock +man/man1/sunclock.1.gz %%DATADIR%%/Sunclockrc %%DATADIR%%/earthmaps/vmf/countries.vmf.gz %%DATADIR%%/earthmaps/vmf/landwater.vmf.gz Modified: head/astro/wmjupiter/Makefile ============================================================================== --- head/astro/wmjupiter/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/wmjupiter/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -14,13 +14,12 @@ PLIST_FILES= bin/wmJupiter WRKSRC= ${WRKDIR}/wmJupiter USE_XORG= x11 xext xpm USES= gmake -NO_STAGE= yes pre-patch: @${REINPLACE_CMD} -e 's|values.h|float.h|; s|MAXDOUBLE|DBL_MAX|g' \ ${WRKSRC}/wmJupiter.c do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/wmJupiter ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/wmJupiter ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/astro/wmmoonclock/Makefile ============================================================================== --- head/astro/wmmoonclock/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/wmmoonclock/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -14,13 +14,11 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_XORG= xpm USES= gmake -NO_STAGE= yes -MAN1= wmmoonclock.1 -PLIST_FILES= bin/wmmoonclock +PLIST_FILES= bin/wmmoonclock man/man1/wmmoonclock.1.gz do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmMoonClock ${PREFIX}/bin/wmmoonclock - ${INSTALL_MAN} ${WRKSRC}/wmMoonClock.1 ${PREFIX}/man/man1/wmmoonclock.1 + ${INSTALL_PROGRAM} ${WRKSRC}/wmMoonClock ${STAGEDIR}${PREFIX}/bin/wmmoonclock + ${INSTALL_MAN} ${WRKSRC}/wmMoonClock.1 ${STAGEDIR}${PREFIX}/man/man1/wmmoonclock.1 .include <bsd.port.mk> Modified: head/astro/wmsun/Makefile ============================================================================== --- head/astro/wmsun/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/wmsun/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -20,13 +20,11 @@ ALL_TARGET= clean all MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib" MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes -MAN1= wmSun.1 -PLIST_FILES= bin/wmSun +PLIST_FILES= bin/wmSun man/man1/wmSun.1.gz do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmSun ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wmSun.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/wmSun ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/wmSun.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include <bsd.port.mk> Modified: head/astro/xeartk/Makefile ============================================================================== --- head/astro/xeartk/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/xeartk/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -12,7 +12,6 @@ COMMENT= Small demo for tkgeomap LIB_DEPENDS= libtkgeomap.so:${PORTSDIR}/astro/tkgeomap -NO_STAGE= yes USES+= tk:run NO_BUILD= yes DATA_FILES= README cities land.xdr rivers.xdr water.xdr @@ -24,8 +23,8 @@ post-patch: @${REINPLACE_CMD} -e 's| 0\([0-9]\)| \1|g' ${WRKSRC}/data/cities do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/src/XEartk.tcl ${PREFIX}/bin/${PORTNAME} - @${INSTALL} -d ${DATADIR} - @${INSTALL_DATA} ${DATA_FILES:S,^,${WRKSRC}/data/,} ${DATADIR}/ + @${INSTALL_SCRIPT} ${WRKSRC}/src/XEartk.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @${INSTALL} -d ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${DATA_FILES:S,^,${WRKSRC}/data/,} ${STAGEDIR}${DATADIR}/ .include <bsd.port.mk> Modified: head/astro/xphoon/Makefile ============================================================================== --- head/astro/xphoon/Makefile Fri Oct 25 05:43:41 2013 (r331557) +++ head/astro/xphoon/Makefile Fri Oct 25 06:28:14 2013 (r331558) @@ -11,11 +11,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/./ MAINTAINER= ports@FreeBSD.org COMMENT= Set the root window to the moon in its current phase -NO_STAGE= yes USES= imake USE_XORG= x11 xext -MAN1= xphoon.1 -PLIST_FILES= bin/xphoon +PLIST_FILES= bin/xphoon man/man1/xphoon.1.gz .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310250628.r9P6SEpM029194>