ports/93112: [MAINTAINER] games/wop: Update to 0.4.1
Dmitry Marakasov
amdmi3 at mail.ru
Fri Feb 10 00:40:04 UTC 2006
>Number: 93112
>Category: ports
>Synopsis: [MAINTAINER] games/wop: Update to 0.4.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 10 00:40:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #1: Fri Jan 27 12:07:19 MSK 2006 amdmi3 at hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
- Update to 0.4.1
- Unbreak on 4.x
- Add more intelligent global config file handling
>How-To-Repeat:
>Fix:
--- wop-0.4.1.patch begins here ---
diff -ruN wop.orig/Makefile wop/Makefile
--- wop.orig/Makefile Tue Dec 27 07:52:55 2005
+++ wop/Makefile Fri Feb 10 03:21:59 2006
@@ -6,7 +6,7 @@
#
PORTNAME= wop
-PORTVERSION= 0.4
+PORTVERSION= 0.4.1
CATEGORIES= games
MASTER_SITES= http://wormsofprey.org/download/
DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
@@ -21,6 +21,7 @@
USE_SDL= sdl net mixer ttf image
USE_GMAKE= yes
USE_REINPLACE= yes
+USE_GCC= 3.4+
MAKE_ENV= "CXX=${CXX}"
@@ -29,7 +30,7 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Does not compile on < 5.x"
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-src-global.hpp
.endif
post-patch:
@@ -39,11 +40,16 @@
@${REINPLACE_CMD} -e 's|= g++|?= g++|g' ${WRKSRC}/sdlwidgets/Makefile ${WRKSRC}/src/Makefile
@${REINPLACE_CMD} -e 's|/etc/woprc|${PREFIX}/etc/woprc|' ${WRKSRC}/src/wopsettings.cpp
@${REINPLACE_CMD} -e 's|\./data|${DATADIR}|' ${WRKSRC}/woprc
+ @${REINPLACE_CMD} -e '/stdint.h/ d' ${WRKSRC}/src/attachableobject.cpp
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/wop ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/woprc ${PREFIX}/etc
+ ${INSTALL_DATA} ${WRKSRC}/woprc ${PREFIX}/etc/woprc.sample
+ if [ ! -f ${PREFIX}/etc/woprc ]; then \
+ ${INSTALL_DATA} ${WRKSRC}/woprc ${PREFIX}/etc; \
+ fi
+ @echo "Installing data files..."
@cd ${WRKDIR}/${PORTNAME}data-${DATAVERSION}; \
${FIND} . -type d -exec ${MKDIR} ${DATADIR}/{} \; ; \
${FIND} . -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
diff -ruN wop.orig/distinfo wop/distinfo
--- wop.orig/distinfo Tue Dec 27 05:20:07 2005
+++ wop/distinfo Fri Feb 10 01:42:26 2006
@@ -1,6 +1,6 @@
-MD5 (wop-0.4-src.tar.bz2) = f508cf330815eb727552b88303d40ec5
-SHA256 (wop-0.4-src.tar.bz2) = 96127385234861e78b41085e9f0490423a813bf0eb31e7c4b157725a14879349
-SIZE (wop-0.4-src.tar.bz2) = 275247
+MD5 (wop-0.4.1-src.tar.bz2) = 339c6a832a5add5c0867a0aca6c935bb
+SHA256 (wop-0.4.1-src.tar.bz2) = 787f60362d605ba4fb3df2f513605587a84015153777c05c84679ef3ed23d82b
+SIZE (wop-0.4.1-src.tar.bz2) = 279613
MD5 (wopdata-2005-12-21.tar.bz2) = 0bf42f28e03dcac5c8066b46d7733907
SHA256 (wopdata-2005-12-21.tar.bz2) = cd6b8eb9f77f709d7a52b913d8a665bd202c53ceca9cf96b4c9f9adc17d8a6b2
SIZE (wopdata-2005-12-21.tar.bz2) = 4217006
diff -ruN wop.orig/files/extra-patch-src-global.hpp wop/files/extra-patch-src-global.hpp
--- wop.orig/files/extra-patch-src-global.hpp Thu Jan 1 03:00:00 1970
+++ wop/files/extra-patch-src-global.hpp Fri Feb 10 01:42:26 2006
@@ -0,0 +1,11 @@
+--- src/global.hpp.orig Tue Jun 28 17:55:19 2005
++++ src/global.hpp Fri Feb 10 00:42:31 2006
+@@ -44,7 +44,7 @@
+
+ void makePace();
+
+-inline int ROUND( const real x ) { return static_cast<int>( round( x )); }
++#define ROUND(x) (int)((x)-floor(x) < 0.5 ? floor(x) : ceil(x))
+
+ // already defined somewhere else
+ //template<class T> T min( const T a, const T b ) { return a < b ? a : b; }
diff -ruN wop.orig/pkg-plist wop/pkg-plist
--- wop.orig/pkg-plist Tue Dec 27 05:20:07 2005
+++ wop/pkg-plist Fri Feb 10 03:23:34 2006
@@ -1,5 +1,7 @@
bin/wop
-etc/woprc
+ at unexec if cmp -s %D/etc/woprc %D/etc/woprc.sample; then rm -f %D/etc/woprc; fi
+etc/woprc.sample
+ at exec if [ ! -f %D/etc/woprc ]; then cp -p %D/etc/woprc.sample %D/etc/woprc; fi
%%DATADIR%%/images/avatar/worm/remote_control/eyes_rc_left.pnm
%%DATADIR%%/images/avatar/worm/remote_control/eyes_rc_right.pnm
%%DATADIR%%/images/avatar/worm/remote_control/gun_rc_left.pnm
--- wop-0.4.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list