diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-12-15 15:54:17 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-12-15 15:54:17 +0000 |
| commit | cc94ea99ca062e3a9b6fe46420d87b62efa6caf1 (patch) | |
| tree | cd0fd305d4871339c3fa40487629efe2efd9a7d9 /games/netradiant | |
| parent | 8ccc1f70189d853faddd7e61c2133fe30d0d1ab9 (diff) | |
| download | ports-cc94ea99ca062e3a9b6fe46420d87b62efa6caf1.tar.gz ports-cc94ea99ca062e3a9b6fe46420d87b62efa6caf1.zip | |
- Comment out apparently unused yet offending piece of code to unbreak the
build on amd64 (tested on MacBookPro6,2)
- Unify the usage of pre/do-install targets in both ports and stagify them
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=336548
Diffstat (limited to 'games/netradiant')
| -rw-r--r-- | games/netradiant/Makefile | 15 | ||||
| -rw-r--r-- | games/netradiant/files/patch-libs-xml-xmlparser.h | 17 | ||||
| -rw-r--r-- | games/netradiant/pkg-plist | 1 |
3 files changed, 25 insertions, 8 deletions
diff --git a/games/netradiant/Makefile b/games/netradiant/Makefile index 645334b8c965..ac01bb1f5de5 100644 --- a/games/netradiant/Makefile +++ b/games/netradiant/Makefile @@ -33,9 +33,6 @@ LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= ${PORTNAME} SUB_LIST= ARCH=${ARCH} -MAN6= q3map2.6 - -NO_STAGE= yes post-patch: # Add missing checks for __FreeBSD__ @${FIND} ${WRKSRC}/tools -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} \ @@ -47,15 +44,17 @@ post-patch: x ; s/^/#include "scenelib.h"/ ; G ; }' \ ${WRKSRC}/plugins/mapq3/parse.h -do-install: +pre-install: # Fix permissions of some files (drop bogus execute bit) @${FIND} ${WRKSRC}/install/osirion.game -type f | ${XARGS} ${CHMOD} a-x @${CHMOD} a-x ${WRKSRC}/install/games/osirion.game # Remove extra copy of GNU GPL from what we install @${RM} ${WRKSRC}/install/GPL.txt - @${MKDIR} ${DATADIR} - ${CP} -a ${WRKSRC}/install/* ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${DISTDIR}/${MAN6} ${MANPREFIX}/man/man6 + +do-install: + @${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} -a ${WRKSRC}/install/* ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${DISTDIR}/q3map2.6 ${STAGEDIR}${MANPREFIX}/man/man6 .include <bsd.port.mk> diff --git a/games/netradiant/files/patch-libs-xml-xmlparser.h b/games/netradiant/files/patch-libs-xml-xmlparser.h new file mode 100644 index 000000000000..deaf0ac5512d --- /dev/null +++ b/games/netradiant/files/patch-libs-xml-xmlparser.h @@ -0,0 +1,17 @@ +--- libs/xml/xmlparser.h.orig 2013-06-30 22:04:34.000000000 +0800 ++++ libs/xml/xmlparser.h 2013-12-15 01:59:46.000000000 +0800 +@@ -102,12 +102,14 @@ inline TextOutputStreamType& ostream_wri + return ostream; + } + ++#if 0 + template<typename TextOutputStreamType> + inline TextOutputStreamType& ostream_write( TextOutputStreamType& ostream, const Formatted& formatted ){ + char buffer[1024]; + ostream.write( buffer, vsnprintf( buffer, 1023, formatted.m_format, formatted.m_arguments ) ); + return ostream; + } ++#endif + + class XMLSAXImporter + { diff --git a/games/netradiant/pkg-plist b/games/netradiant/pkg-plist index 935313ec0d98..32f093eff68f 100644 --- a/games/netradiant/pkg-plist +++ b/games/netradiant/pkg-plist @@ -1,4 +1,5 @@ bin/netradiant +man/man6/q3map2.6.gz %%DATADIR%%/RADIANT_MAJOR %%DATADIR%%/RADIANT_MINOR %%DATADIR%%/README.txt |