Date: Mon, 22 Dec 2003 20:23:46 -0500 From: Charles Swiger <cswiger@mac.com> To: Nuno Teixeira <nunotex@freeshell.org> Cc: freebsd-ports@freebsd.org Subject: Re: bzflag 1.10.2 is out (bugfix release) Message-ID: <A754D394-34E6-11D8-8497-003065ABFD92@mac.com> In-Reply-To: <20031222225151.GA3338@SDF.LONESTAR.ORG> References: <20031222225151.GA3338@SDF.LONESTAR.ORG>
next in thread | previous in thread | raw e-mail | index | archive | help
On Dec 22, 2003, at 5:51 PM, Nuno Teixeira wrote:
> A bugfix release of bzflag is out. Please update.
I've got the start of an update to the port, but the source tarball
seems to have some auto-generated files not present-- ./configure
fails working from the original sources. With mkdir and touch, I've
worked around that:
diff -duwrP bzflag_orig/Makefile bzflag/Makefile
--- bzflag_orig/Makefile Mon Dec 22 18:19:26 2003
+++ bzflag/Makefile Mon Dec 22 19:24:37 2003
@@ -6,17 +6,15 @@
#
PORTNAME= bzflag
-PORTVERSION= 1.10.0
+PORTVERSION= 1.10.2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-${PORTVERSION:R}.20031209
+DISTNAME= ${PORTNAME}-${PORTVERSION}.20031221
MAINTAINER= chuck@pkix.net
COMMENT= A multiplayer 3D tank battle game
-WRKSRC= ${WRKDIR}/${PORTNAME}-1.9.10.20031209
-
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
@@ -30,5 +28,11 @@
post-patch:
@${REINPLACE_CMD} -e 's|@LINUX_TRUE@||g ; \
s|@LINUX_FALSE@|#|g' ${WRKSRC}/src/platform/Makefile.in
+ @${MKDIR} ${WRKSRC}/src/platform/MacOSX/BZFlag.pbproj
+ @${MKDIR}
${WRKSRC}/src/platform/MacOSX/English.lproj/MainMenu.nib
+ @${TOUCH} ${WRKSRC}/src/platform/MacOSX/Makefile.in
+ @${TOUCH}
${WRKSRC}/src/platform/MacOSX/BZFlag.pbproj/Makefile.in
+ @${TOUCH}
${WRKSRC}/src/platform/MacOSX/English.lproj/Makefile.in
+ @${TOUCH}
${WRKSRC}/src/platform/MacOSX/English.lproj/MainMenu.nib/Makefile.in
.include <bsd.port.mk>
diff -duwrP bzflag_orig/distinfo bzflag/distinfo
--- bzflag_orig/distinfo Mon Dec 22 18:19:26 2003
+++ bzflag/distinfo Mon Dec 22 18:27:40 2003
@@ -1 +1 @@
-MD5 (bzflag-1.10.20031209.tar.gz) = 2dd502bfdee96b9d5055ea3125a4b95a
+MD5 (bzflag-1.10.2.20031221.tar.gz) = 2b90a11ea72f358b181da2e2107664ee
Only in bzflag_orig/files: patch-src::bzadmin::CursesUI.cxx
Only in bzflag_orig/files: patch-src::bzflag::Makefile.in
========
However, there is a second issue involving some autoconf-fu with the
Makefile install targets:
transform = @program_transform_name@
...that line gets turned into a sed script containing configure's
target-triplet, which causes the programs and manpages to be installed
as (for example) "i386-portbld-freebsd4.9-bzfrelay" rather than
"bzfrelay".
Something like the following works:
--- bzflag_orig/files/patch-man::Makefile.in Wed Dec 31 19:00:00 1969
+++ bzflag/files/patch-man::Makefile.in Mon Dec 22 19:53:18 2003
@@ -0,0 +1,11 @@
+--- man/Makefile.in_orig Mon Dec 22 19:42:24 2003
++++ man/Makefile.in Mon Dec 22 19:43:02 2003
+@@ -145,7 +145,7 @@
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++ inst=`echo $$inst`.$$ext; \
+ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man6dir)/$$inst"; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(man6dir)/$$inst; \
+ done
...but maybe someone else can figure out how to turn this re-writing
off globally, rather than patching individual Makefiles...?
--
-Chuck
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A754D394-34E6-11D8-8497-003065ABFD92>