svn commit: r328532 - in head: games/gigalomania games/quackle graphics/mirage graphics/podofo

Pawel Pekala pawel at FreeBSD.org
Fri Sep 27 22:56:08 UTC 2013


Author: pawel
Date: Fri Sep 27 22:56:06 2013
New Revision: 328532
URL: http://svnweb.freebsd.org/changeset/ports/328532

Log:
  Add support for STAGEDIR

Modified:
  head/games/gigalomania/Makefile
  head/games/quackle/Makefile
  head/graphics/mirage/Makefile
  head/graphics/mirage/pkg-plist   (contents, props changed)
  head/graphics/podofo/Makefile
  head/graphics/podofo/pkg-plist   (contents, props changed)

Modified: head/games/gigalomania/Makefile
==============================================================================
--- head/games/gigalomania/Makefile	Fri Sep 27 22:39:18 2013	(r328531)
+++ head/games/gigalomania/Makefile	Fri Sep 27 22:56:06 2013	(r328532)
@@ -17,9 +17,6 @@ PORTDOCS=	readme.html
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|CC=g++|CC=${CXX}|' \
 		-e '/^CCFLAGS/ s|-O2|${CXXFLAGS}|' \
@@ -36,19 +33,19 @@ post-patch:
 		${WRKSRC}/gamestate.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for dir in gfx islands sound
-	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}
 .endfor
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_fullscreen.desktop \
-		${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}64.png ${PREFIX}/share/pixmaps
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.html ${DOCSDIR}
-.endif
+		${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}64.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/quackle/Makefile
==============================================================================
--- head/games/quackle/Makefile	Fri Sep 27 22:39:18 2013	(r328531)
+++ head/games/quackle/Makefile	Fri Sep 27 22:56:06 2013	(r328532)
@@ -24,7 +24,6 @@ USE_QT4=	gui moc_build qmake_build
 
 DESKTOP_ENTRIES="Quackle" "${COMMENT}" "" "quackle" "Game;BoardGame;" "true"
 
-NO_STAGE=	yes
 post-extract:
 	@${FIND} ${WRKSRC} \( -name "*.[ao]" -or -name "moc_*" \) -delete
 
@@ -48,7 +47,8 @@ pre-build:
 .endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/quacker ${PREFIX}/bin/quackle
-	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR})
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/quacker \
+		${STAGEDIR}${PREFIX}/bin/quackle
+	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>

Modified: head/graphics/mirage/Makefile
==============================================================================
--- head/graphics/mirage/Makefile	Fri Sep 27 22:39:18 2013	(r328531)
+++ head/graphics/mirage/Makefile	Fri Sep 27 22:56:06 2013	(r328532)
@@ -19,11 +19,11 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Mirage
 
+PORTDOCS=	CHANGELOG README TODO TRANSLATORS
 PORT_VERBS=	${PORTNAME} imgfuncs
 
 OPTIONS_DEFINE=	DOCS GNOME
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNOME}
@@ -35,11 +35,7 @@ post-patch:
 		's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for file in CHANGELOG README TODO TRANSLATORS
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/mirage/pkg-plist
==============================================================================
--- head/graphics/mirage/pkg-plist	Fri Sep 27 22:39:18 2013	(r328531)
+++ head/graphics/mirage/pkg-plist	Fri Sep 27 22:56:06 2013	(r328532)
@@ -5,10 +5,6 @@ bin/mirage
 %%PYTHON_SITELIBDIR%%/mirage.pyo
 %%PYTHON_SITELIBDIR%%/xmouse.so
 share/applications/mirage.desktop
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TRANSLATORS
 share/locale/cs/LC_MESSAGES/mirage.mo
 share/locale/de/LC_MESSAGES/mirage.mo
 share/locale/es/LC_MESSAGES/mirage.mo
@@ -27,7 +23,6 @@ share/locale/zh_CN/LC_MESSAGES/mirage.mo
 %%DATADIR%%/stock_shuffle.png
 share/pixmaps/mirage.png
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/locale/ua/LC_MESSAGES
 @dirrmtry share/locale/ua
 @dirrmtry share/applications

Modified: head/graphics/podofo/Makefile
==============================================================================
--- head/graphics/podofo/Makefile	Fri Sep 27 22:39:18 2013	(r328531)
+++ head/graphics/podofo/Makefile	Fri Sep 27 22:56:06 2013	(r328532)
@@ -25,12 +25,6 @@ CMAKE_ARGS=	-DPODOFO_BUILD_SHARED:BOOL=T
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		podofobox.1 podofocountpages.1 podofocrop.1 \
-		podofoencrypt.1 podofoimg2pdf.1 podofoimgextract.1 \
-		podofoimpose.1 podofoincrementalupdates.1 podofomerge.1 \
-		podofopages.1 podofopdfinfo.1 podofotxt2pdf.1 \
-		podofotxtextract.1 podofouncompress.1 podofoxmp.1
-
 OPTIONS_DEFINE=		IMPOSE JPEG PNG TIFF
 OPTIONS_DEFAULT=	JPEG PNG TIFF
 IMPOSE_DESC=		Build impose tool (needs Lua)
@@ -48,7 +42,6 @@ PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}
 TIFF_CMAKE_ON=		-DWANT_TIFF:BOOL=TRUE
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMPOSE}

Modified: head/graphics/podofo/pkg-plist
==============================================================================
--- head/graphics/podofo/pkg-plist	Fri Sep 27 22:39:18 2013	(r328531)
+++ head/graphics/podofo/pkg-plist	Fri Sep 27 22:56:06 2013	(r328532)
@@ -120,6 +120,21 @@ include/podofo/podofo-base.h
 include/podofo/podofo.h
 lib/libpodofo.so
 lib/libpodofo.so.0
+man/man1/podofobox.1.gz
+man/man1/podofocountpages.1.gz
+man/man1/podofocrop.1.gz
+man/man1/podofoencrypt.1.gz
+man/man1/podofoimg2pdf.1.gz
+man/man1/podofoimgextract.1.gz
+man/man1/podofoimpose.1.gz
+man/man1/podofoincrementalupdates.1.gz
+man/man1/podofomerge.1.gz
+man/man1/podofopages.1.gz
+man/man1/podofopdfinfo.1.gz
+man/man1/podofotxt2pdf.1.gz
+man/man1/podofotxtextract.1.gz
+man/man1/podofouncompress.1.gz
+man/man1/podofoxmp.1.gz
 @dirrm include/podofo/doc
 @dirrm include/podofo/base/util
 @dirrm include/podofo/base


More information about the svn-ports-all mailing list