svn commit: r336548 - in head/games: gtkradiant gtkradiant/files netradiant netradiant/files
Alexey Dokuchaev
danfe at FreeBSD.org
Sun Dec 15 15:54:19 UTC 2013
Author: danfe
Date: Sun Dec 15 15:54:17 2013
New Revision: 336548
URL: http://svnweb.freebsd.org/changeset/ports/336548
Log:
- 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
Added:
head/games/gtkradiant/files/patch-libs__xml__xmlparser.h (contents, props changed)
head/games/netradiant/files/patch-libs-xml-xmlparser.h (contents, props changed)
Modified:
head/games/gtkradiant/Makefile
head/games/gtkradiant/pkg-plist
head/games/netradiant/Makefile
head/games/netradiant/pkg-plist
Modified: head/games/gtkradiant/Makefile
==============================================================================
--- head/games/gtkradiant/Makefile Sun Dec 15 15:50:28 2013 (r336547)
+++ head/games/gtkradiant/Makefile Sun Dec 15 15:54:17 2013 (r336548)
@@ -33,7 +33,6 @@ WRKSRC= ${WRKDIR}/GPL/GtkRadiant
SUB_FILES= ${PORTNAME}
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/SConscript
@${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \
@@ -62,13 +61,13 @@ post-patch:
@${FIND} ${WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} \
-E 's|(gtk_adjustment_new[^)]*,)[^)]*|\1 0|'
-post-build:
+pre-install:
cd ${WRKSRC} && ${PYTHON_CMD} install.py
${CP} -a ${WRKDIR}/${PORTNAME}_gamepacks/* ${WRKSRC}/install
do-install:
- @${MKDIR} ${DATADIR}
- ${CP} -a ${WRKSRC}/install/* ${DATADIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ ${CP} -a ${WRKSRC}/install/* ${STAGEDIR}${DATADIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Added: head/games/gtkradiant/files/patch-libs__xml__xmlparser.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/gtkradiant/files/patch-libs__xml__xmlparser.h Sun Dec 15 15:54:17 2013 (r336548)
@@ -0,0 +1,18 @@
+--- libs/xml/xmlparser.h.orig 2006-02-11 06:01:20.000000000 +0800
++++ libs/xml/xmlparser.h 2013-12-15 02:23:59.000000000 +0800
+@@ -113,6 +113,7 @@ inline TextOutputStreamType& ostream_wri
+ return ostream;
+ }
+
++#if 0
+ template<typename TextOutputStreamType>
+ inline TextOutputStreamType& ostream_write(TextOutputStreamType& ostream, const Formatted& formatted)
+ {
+@@ -120,6 +121,7 @@ inline TextOutputStreamType& ostream_wri
+ ostream.write(buffer, vsnprintf(buffer, 1023, formatted.m_format, formatted.m_arguments));
+ return ostream;
+ }
++#endif
+
+ class XMLSAXImporter
+ {
Modified: head/games/gtkradiant/pkg-plist
==============================================================================
--- head/games/gtkradiant/pkg-plist Sun Dec 15 15:50:28 2013 (r336547)
+++ head/games/gtkradiant/pkg-plist Sun Dec 15 15:54:17 2013 (r336548)
@@ -76,9 +76,7 @@ bin/gtkradiant
%%DATADIR%%/games/et.game
%%DATADIR%%/games/heretic2.game
%%DATADIR%%/games/hl.game
-%%DATADIR%%/games/hlcs.game
%%DATADIR%%/games/ja.game
-%%DATADIR%%/games/jabp.game
%%DATADIR%%/games/jk2.game
%%DATADIR%%/games/q1.game
%%DATADIR%%/games/q2.game
@@ -194,14 +192,11 @@ bin/gtkradiant
@dirrm %%DATADIR%%/q2.game
@dirrm %%DATADIR%%/q1.game/id1
@dirrm %%DATADIR%%/q1.game
- at dirrm %%DATADIR%%/plugins
@dirrm %%DATADIR%%/modules
@dirrm %%DATADIR%%/jk2.game/base
@dirrm %%DATADIR%%/jk2.game
- at dirrm %%DATADIR%%/jabp.game
@dirrm %%DATADIR%%/ja.game/base
@dirrm %%DATADIR%%/ja.game
- at dirrm %%DATADIR%%/hlcs.game
@dirrm %%DATADIR%%/hl.game/valve
@dirrm %%DATADIR%%/hl.game/cstrike
@dirrm %%DATADIR%%/hl.game
Modified: head/games/netradiant/Makefile
==============================================================================
--- head/games/netradiant/Makefile Sun Dec 15 15:50:28 2013 (r336547)
+++ head/games/netradiant/Makefile Sun Dec 15 15:54:17 2013 (r336548)
@@ -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>
Added: head/games/netradiant/files/patch-libs-xml-xmlparser.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/netradiant/files/patch-libs-xml-xmlparser.h Sun Dec 15 15:54:17 2013 (r336548)
@@ -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
+ {
Modified: head/games/netradiant/pkg-plist
==============================================================================
--- head/games/netradiant/pkg-plist Sun Dec 15 15:50:28 2013 (r336547)
+++ head/games/netradiant/pkg-plist Sun Dec 15 15:54:17 2013 (r336548)
@@ -1,4 +1,5 @@
bin/netradiant
+man/man6/q3map2.6.gz
%%DATADIR%%/RADIANT_MAJOR
%%DATADIR%%/RADIANT_MINOR
%%DATADIR%%/README.txt
More information about the svn-ports-head
mailing list