Re: [update] eduke32/5775
On 07/06/16 18:27, Ryan Freeman wrote:
> On Sun, Jun 26, 2016 at 01:35:44PM -0700, Ryan Freeman wrote:
>> On Sat, Jun 18, 2016 at 11:50:55PM -0700, Ryan Freeman wrote:
>>> On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote:
The old version was something like 3 years old and 2000 weeklies behind.
I've talked to the dev and it now builds cleanly without patches(or rather,
I made the changes needed and got it merged into the project.)
Now it'll actually run the official expansions properly, as well as all the
other additions since 2013.
>>>
>>> Here is a patch against current ports cvs triggered by Daniel's update.
>>> WANTLIB and LIB_DEPENDS have been regenerated. the do-install paths have
>>> been corrected, I removed the dos2unix stuff as I don't think it is that
>>> big a deal in the end, and it matches upstream.
>>>
>>> The datafile path substitutions have been reduced to one file (yay), and
>>> perl has been switched out in lieu of sed.
>>>
>>> Unfortunately the Makefile.common has some mean tricks to really break our
>>> ability to feed CC/CXX, so I did some hack'n'slash patching of it. I am
>>> not sure that this is best, I have employed their recommended
>>> PACKAGE_REPOSITORY=1 setting to 'not completely gut all their
>>> optimizations'..
>>> but I'd love it if anyone can confirm its okay :-) looks to just use -O2.
>>>
>>> Turning on aggressive debugging things like DEBUGANYWAY kinda broke mouse
>>> input making it really hard to play, so avoiding that path.
>>>
>>> Lastly I think we need to use ports gcc now.
>>>
>>> works good here on current amd64
>>
>> ping?
>
> Anyone? I saw the mail go out about pending ports lock, this definitely
> isn't something terribly important, but if there is opportunity to squeeze
> it in before lock, why not?
>
>>> Cheers!
>>> -ryan
>>>
>>>
>>> ? eduke32.diff
>>> Index: Makefile
>>> ===
>>> RCS file: /cvs/ports/games/eduke32/Makefile,v
>>> retrieving revision 1.7
>>> diff -u -p -r1.7 Makefile
>>> --- Makefile22 Oct 2014 13:55:07 - 1.7
>>> +++ Makefile19 Jun 2016 06:43:09 -
>>> @@ -1,12 +1,11 @@
>>> # $OpenBSD: Makefile,v 1.7 2014/10/22 13:55:07 jasper Exp $
>>>
>>> COMMENT = Enhanced Duke Nukem 3D engine
>>> -RDATE =20120301
>>> -RTAG = 2394
>>> +RDATE =20160610
>>> +RTAG = 5775
>>> DISTNAME = eduke32_src_${RDATE}-${RTAG}
>>> PKGNAME = eduke32-2.0.0.${RTAG}
>>> -REVISION = 2
>>> -EXTRACT_SUFX = .tar.bz2
>>> +EXTRACT_SUFX = .tar.xz
>>> CATEGORIES = games x11
>>>
>>> HOMEPAGE = http://www.eduke32.com/
>>> @@ -25,12 +24,15 @@ BUILD_DEPENDS = archivers/unzip \
>>> BUILD_DEPENDS += devel/nasm
>>> .endif
>>>
>>> -WANTLIB = SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx
>>> +WANTLIB += c m ogg png pthread vorbis vorbisfile vpx z
>>> +WANTLIB += SDL2 SDL2_mixer FLAC execinfo
>>>
>>> LIB_DEPENDS = audio/libvorbis \
>>> - multimedia/libvpx \
>>> - devel/sdl \
>>> - devel/sdl-mixer
>>> + audio/flac \
>>> + devel/sdl2 \
>>> + devel/sdl2-mixer \
>>> + devel/libexecinfo \
>>> + multimedia/libvpx
>>>
>>> # dlopen()'d; shows as Extra in check-lib-depends but it is used
>>> LIB_DEPENDS += x11/gtk+2
>>> @@ -38,31 +40,23 @@ WANTLIB += gtk-x11-2.0
>>>
>>> RUN_DEPENDS = games/duke3ddata
>>>
>>> -MASTER_SITES =
>>> http://dukeworld.duke4.net/eduke32/synthesis/old/${RDATE}-${RTAG}/ \
>>> - http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
>>> +MASTER_SITES =
>>> http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
>>> +
>>> +MODULES = gcc4
>>> +MODGCC4_LANGS =c c++
>>> +MODGCC4_ARCHS =*
>>>
>>> # make sure we can see compilation output, respect CC/CXX, don't strip!
>>> -MAKE_FLAGS = PRETTY_OUTPUT=0 CC="${CC}" CXX="${CXX}" DEBUGANYWAY=1
>>> +MAKE_ENV = CC="${CC}" CXX="${CXX}" PRETTY_OUTPUT=0 PACKAGE_REPOSITORY=1
>>> USE_GMAKE =Yes
>>> NO_TEST = Yes
>>>
>>> -WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}/
>>> +WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}
>>>
>>> post-extract:
>>> # check for data files in correct location
>>> - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
>>> - ${WRKSRC}/source/astub.c
>>> - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
>>> - ${WRKSRC}/source/game.c
>>> - @perl -pi -e "s,./eduke32,eduke32," ${WRKSRC}/build/include/editor.h
>>> - # make plaintext files less annoying to read...
>>> - @perl -MExtUtils::Command -e dos2unix \
>>> - ${WRKSRC}/tiles.cfg \
>>> - ${WRKSRC}/names.h \
>>> - ${WRKSRC}/GNU.TXT \
>>> - ${WRKSRC}/buildlic.txt \
>>> - ${WRKSRC}/samples/*.sample \
>>> - ${WRKSRC}/samples/*.txt
>>> + @sed
Re: [update] eduke32/5775
On Sun, Jun 26, 2016 at 01:35:44PM -0700, Ryan Freeman wrote:
> On Sat, Jun 18, 2016 at 11:50:55PM -0700, Ryan Freeman wrote:
> > On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote:
> > > The old version was something like 3 years old and 2000 weeklies behind.
> > > I've talked to the dev and it now builds cleanly without patches(or
> > > rather,
> > > I made the changes needed and got it merged into the project.)
> > >
> > > Now it'll actually run the official expansions properly, as well as all
> > > the
> > > other additions since 2013.
> >
> > Here is a patch against current ports cvs triggered by Daniel's update.
> > WANTLIB and LIB_DEPENDS have been regenerated. the do-install paths have
> > been corrected, I removed the dos2unix stuff as I don't think it is that
> > big a deal in the end, and it matches upstream.
> >
> > The datafile path substitutions have been reduced to one file (yay), and
> > perl has been switched out in lieu of sed.
> >
> > Unfortunately the Makefile.common has some mean tricks to really break our
> > ability to feed CC/CXX, so I did some hack'n'slash patching of it. I am
> > not sure that this is best, I have employed their recommended
> > PACKAGE_REPOSITORY=1 setting to 'not completely gut all their
> > optimizations'..
> > but I'd love it if anyone can confirm its okay :-) looks to just use -O2.
> >
> > Turning on aggressive debugging things like DEBUGANYWAY kinda broke mouse
> > input making it really hard to play, so avoiding that path.
> >
> > Lastly I think we need to use ports gcc now.
> >
> > works good here on current amd64
>
> ping?
Anyone? I saw the mail go out about pending ports lock, this definitely
isn't something terribly important, but if there is opportunity to squeeze
it in before lock, why not?
> > Cheers!
> > -ryan
> >
> >
> > ? eduke32.diff
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/eduke32/Makefile,v
> > retrieving revision 1.7
> > diff -u -p -r1.7 Makefile
> > --- Makefile22 Oct 2014 13:55:07 - 1.7
> > +++ Makefile19 Jun 2016 06:43:09 -
> > @@ -1,12 +1,11 @@
> > # $OpenBSD: Makefile,v 1.7 2014/10/22 13:55:07 jasper Exp $
> >
> > COMMENT = Enhanced Duke Nukem 3D engine
> > -RDATE =20120301
> > -RTAG = 2394
> > +RDATE =20160610
> > +RTAG = 5775
> > DISTNAME = eduke32_src_${RDATE}-${RTAG}
> > PKGNAME = eduke32-2.0.0.${RTAG}
> > -REVISION = 2
> > -EXTRACT_SUFX = .tar.bz2
> > +EXTRACT_SUFX = .tar.xz
> > CATEGORIES = games x11
> >
> > HOMEPAGE = http://www.eduke32.com/
> > @@ -25,12 +24,15 @@ BUILD_DEPENDS = archivers/unzip \
> > BUILD_DEPENDS += devel/nasm
> > .endif
> >
> > -WANTLIB = SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx
> > +WANTLIB += c m ogg png pthread vorbis vorbisfile vpx z
> > +WANTLIB += SDL2 SDL2_mixer FLAC execinfo
> >
> > LIB_DEPENDS = audio/libvorbis \
> > - multimedia/libvpx \
> > - devel/sdl \
> > - devel/sdl-mixer
> > + audio/flac \
> > + devel/sdl2 \
> > + devel/sdl2-mixer \
> > + devel/libexecinfo \
> > + multimedia/libvpx
> >
> > # dlopen()'d; shows as Extra in check-lib-depends but it is used
> > LIB_DEPENDS += x11/gtk+2
> > @@ -38,31 +40,23 @@ WANTLIB += gtk-x11-2.0
> >
> > RUN_DEPENDS = games/duke3ddata
> >
> > -MASTER_SITES =
> > http://dukeworld.duke4.net/eduke32/synthesis/old/${RDATE}-${RTAG}/ \
> > - http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
> > +MASTER_SITES =
> > http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
> > +
> > +MODULES = gcc4
> > +MODGCC4_LANGS =c c++
> > +MODGCC4_ARCHS =*
> >
> > # make sure we can see compilation output, respect CC/CXX, don't strip!
> > -MAKE_FLAGS = PRETTY_OUTPUT=0 CC="${CC}" CXX="${CXX}" DEBUGANYWAY=1
> > +MAKE_ENV = CC="${CC}" CXX="${CXX}" PRETTY_OUTPUT=0 PACKAGE_REPOSITORY=1
> > USE_GMAKE =Yes
> > NO_TEST = Yes
> >
> > -WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}/
> > +WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}
> >
> > post-extract:
> > # check for data files in correct location
> > - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
> > - ${WRKSRC}/source/astub.c
> > - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
> > - ${WRKSRC}/source/game.c
> > - @perl -pi -e "s,./eduke32,eduke32," ${WRKSRC}/build/include/editor.h
> > - # make plaintext files less annoying to read...
> > - @perl -MExtUtils::Command -e dos2unix \
> > - ${WRKSRC}/tiles.cfg \
> > - ${WRKSRC}/names.h \
> > - ${WRKSRC}/GNU.TXT \
> > - ${WRKSRC}/buildlic.txt \
> > - ${WRKSRC}/samples/*.sample \
> > - ${WRKSRC}/samples/*.txt
> > + @sed -i
Re: [update] eduke32/5775
On Sat, Jun 18, 2016 at 11:50:55PM -0700, Ryan Freeman wrote:
> On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote:
> > The old version was something like 3 years old and 2000 weeklies behind.
> > I've talked to the dev and it now builds cleanly without patches(or rather,
> > I made the changes needed and got it merged into the project.)
> >
> > Now it'll actually run the official expansions properly, as well as all the
> > other additions since 2013.
> >
> >
>
> Here is a patch against current ports cvs triggered by Daniel's update.
> WANTLIB and LIB_DEPENDS have been regenerated. the do-install paths have
> been corrected, I removed the dos2unix stuff as I don't think it is that
> big a deal in the end, and it matches upstream.
>
> The datafile path substitutions have been reduced to one file (yay), and
> perl has been switched out in lieu of sed.
>
> Unfortunately the Makefile.common has some mean tricks to really break our
> ability to feed CC/CXX, so I did some hack'n'slash patching of it. I am
> not sure that this is best, I have employed their recommended
> PACKAGE_REPOSITORY=1 setting to 'not completely gut all their optimizations'..
> but I'd love it if anyone can confirm its okay :-) looks to just use -O2.
>
> Turning on aggressive debugging things like DEBUGANYWAY kinda broke mouse
> input making it really hard to play, so avoiding that path.
>
> Lastly I think we need to use ports gcc now.
>
> works good here on current amd64
ping?
>
> Cheers!
> -ryan
>
>
> ? eduke32.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/eduke32/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile 22 Oct 2014 13:55:07 - 1.7
> +++ Makefile 19 Jun 2016 06:43:09 -
> @@ -1,12 +1,11 @@
> # $OpenBSD: Makefile,v 1.7 2014/10/22 13:55:07 jasper Exp $
>
> COMMENT =Enhanced Duke Nukem 3D engine
> -RDATE = 20120301
> -RTAG = 2394
> +RDATE = 20160610
> +RTAG = 5775
> DISTNAME = eduke32_src_${RDATE}-${RTAG}
> PKGNAME =eduke32-2.0.0.${RTAG}
> -REVISION = 2
> -EXTRACT_SUFX = .tar.bz2
> +EXTRACT_SUFX = .tar.xz
> CATEGORIES = games x11
>
> HOMEPAGE = http://www.eduke32.com/
> @@ -25,12 +24,15 @@ BUILD_DEPENDS = archivers/unzip \
> BUILD_DEPENDS += devel/nasm
> .endif
>
> -WANTLIB =SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx
> +WANTLIB += c m ogg png pthread vorbis vorbisfile vpx z
> +WANTLIB += SDL2 SDL2_mixer FLAC execinfo
>
> LIB_DEPENDS =audio/libvorbis \
> - multimedia/libvpx \
> - devel/sdl \
> - devel/sdl-mixer
> + audio/flac \
> + devel/sdl2 \
> + devel/sdl2-mixer \
> + devel/libexecinfo \
> + multimedia/libvpx
>
> # dlopen()'d; shows as Extra in check-lib-depends but it is used
> LIB_DEPENDS += x11/gtk+2
> @@ -38,31 +40,23 @@ WANTLIB +=gtk-x11-2.0
>
> RUN_DEPENDS =games/duke3ddata
>
> -MASTER_SITES =
> http://dukeworld.duke4.net/eduke32/synthesis/old/${RDATE}-${RTAG}/ \
> - http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
> +MASTER_SITES =
> http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
> +
> +MODULES =gcc4
> +MODGCC4_LANGS = c c++
> +MODGCC4_ARCHS = *
>
> # make sure we can see compilation output, respect CC/CXX, don't strip!
> -MAKE_FLAGS = PRETTY_OUTPUT=0 CC="${CC}" CXX="${CXX}" DEBUGANYWAY=1
> +MAKE_ENV = CC="${CC}" CXX="${CXX}" PRETTY_OUTPUT=0 PACKAGE_REPOSITORY=1
> USE_GMAKE = Yes
> NO_TEST =Yes
>
> -WRKDIST =${WRKDIR}/eduke32_${RDATE}-${RTAG}/
> +WRKDIST =${WRKDIR}/eduke32_${RDATE}-${RTAG}
>
> post-extract:
> # check for data files in correct location
> - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
> - ${WRKSRC}/source/astub.c
> - @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
> - ${WRKSRC}/source/game.c
> - @perl -pi -e "s,./eduke32,eduke32," ${WRKSRC}/build/include/editor.h
> - # make plaintext files less annoying to read...
> - @perl -MExtUtils::Command -e dos2unix \
> - ${WRKSRC}/tiles.cfg \
> - ${WRKSRC}/names.h \
> - ${WRKSRC}/GNU.TXT \
> - ${WRKSRC}/buildlic.txt \
> - ${WRKSRC}/samples/*.sample \
> - ${WRKSRC}/samples/*.txt
> + @sed -i "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
> + ${WRKSRC}/source/common.c
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKBUILD}/eduke32 ${PREFIX}/bin
> @@ -71,17 +65,25 @@ do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/eduke32
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/eduke32
> # mapster32 help files
> - ${INSTALL_DATA} ${WRKDIST}/m32help.hlp ${PREFIX}/share/duke3d/
>
Re: [update] eduke32/5775
On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote:
> The old version was something like 3 years old and 2000 weeklies behind.
> I've talked to the dev and it now builds cleanly without patches(or rather,
> I made the changes needed and got it merged into the project.)
>
> Now it'll actually run the official expansions properly, as well as all the
> other additions since 2013.
>
>
Here is a patch against current ports cvs triggered by Daniel's update.
WANTLIB and LIB_DEPENDS have been regenerated. the do-install paths have
been corrected, I removed the dos2unix stuff as I don't think it is that
big a deal in the end, and it matches upstream.
The datafile path substitutions have been reduced to one file (yay), and
perl has been switched out in lieu of sed.
Unfortunately the Makefile.common has some mean tricks to really break our
ability to feed CC/CXX, so I did some hack'n'slash patching of it. I am
not sure that this is best, I have employed their recommended
PACKAGE_REPOSITORY=1 setting to 'not completely gut all their optimizations'..
but I'd love it if anyone can confirm its okay :-) looks to just use -O2.
Turning on aggressive debugging things like DEBUGANYWAY kinda broke mouse
input making it really hard to play, so avoiding that path.
Lastly I think we need to use ports gcc now.
works good here on current amd64
Cheers!
-ryan
? eduke32.diff
Index: Makefile
===
RCS file: /cvs/ports/games/eduke32/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile22 Oct 2014 13:55:07 - 1.7
+++ Makefile19 Jun 2016 06:43:09 -
@@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.7 2014/10/22 13:55:07 jasper Exp $
COMMENT = Enhanced Duke Nukem 3D engine
-RDATE =20120301
-RTAG = 2394
+RDATE =20160610
+RTAG = 5775
DISTNAME = eduke32_src_${RDATE}-${RTAG}
PKGNAME = eduke32-2.0.0.${RTAG}
-REVISION = 2
-EXTRACT_SUFX = .tar.bz2
+EXTRACT_SUFX = .tar.xz
CATEGORIES = games x11
HOMEPAGE = http://www.eduke32.com/
@@ -25,12 +24,15 @@ BUILD_DEPENDS = archivers/unzip \
BUILD_DEPENDS += devel/nasm
.endif
-WANTLIB = SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx
+WANTLIB += c m ogg png pthread vorbis vorbisfile vpx z
+WANTLIB += SDL2 SDL2_mixer FLAC execinfo
LIB_DEPENDS = audio/libvorbis \
- multimedia/libvpx \
- devel/sdl \
- devel/sdl-mixer
+ audio/flac \
+ devel/sdl2 \
+ devel/sdl2-mixer \
+ devel/libexecinfo \
+ multimedia/libvpx
# dlopen()'d; shows as Extra in check-lib-depends but it is used
LIB_DEPENDS += x11/gtk+2
@@ -38,31 +40,23 @@ WANTLIB += gtk-x11-2.0
RUN_DEPENDS = games/duke3ddata
-MASTER_SITES =
http://dukeworld.duke4.net/eduke32/synthesis/old/${RDATE}-${RTAG}/ \
- http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
+MASTER_SITES = http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/
+
+MODULES = gcc4
+MODGCC4_LANGS =c c++
+MODGCC4_ARCHS =*
# make sure we can see compilation output, respect CC/CXX, don't strip!
-MAKE_FLAGS = PRETTY_OUTPUT=0 CC="${CC}" CXX="${CXX}" DEBUGANYWAY=1
+MAKE_ENV = CC="${CC}" CXX="${CXX}" PRETTY_OUTPUT=0 PACKAGE_REPOSITORY=1
USE_GMAKE =Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}/
+WRKDIST = ${WRKDIR}/eduke32_${RDATE}-${RTAG}
post-extract:
# check for data files in correct location
- @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
- ${WRKSRC}/source/astub.c
- @perl -pi -e "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
- ${WRKSRC}/source/game.c
- @perl -pi -e "s,./eduke32,eduke32," ${WRKSRC}/build/include/editor.h
- # make plaintext files less annoying to read...
- @perl -MExtUtils::Command -e dos2unix \
- ${WRKSRC}/tiles.cfg \
- ${WRKSRC}/names.h \
- ${WRKSRC}/GNU.TXT \
- ${WRKSRC}/buildlic.txt \
- ${WRKSRC}/samples/*.sample \
- ${WRKSRC}/samples/*.txt
+ @sed -i "s,/usr/share/games/eduke32,${TRUEPREFIX}/share/duke3d," \
+ ${WRKSRC}/source/common.c
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/eduke32 ${PREFIX}/bin
@@ -71,17 +65,25 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/eduke32
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/eduke32
# mapster32 help files
- ${INSTALL_DATA} ${WRKDIST}/m32help.hlp ${PREFIX}/share/duke3d/
- ${INSTALL_DATA} ${WRKDIST}/SEHELP.HLP ${PREFIX}/share/duke3d/
- ${INSTALL_DATA} ${WRKDIST}/STHELP.HLP ${PREFIX}/share/duke3d/
+ ${INSTALL_DATA} ${WRKDIST}/package/sdk/m32help.hlp \
+ ${PREFIX}/share/duke3d/
+ ${INSTALL_DATA}
Re: [update] eduke32/5775
On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote: > The old version was something like 3 years old and 2000 weeklies behind. > I've talked to the dev and it now builds cleanly without patches(or rather, > I made the changes needed and got it merged into the project.) > > Now it'll actually run the official expansions properly, as well as all the > other additions since 2013. > > Hey Daniel, Thanks for the update. Typically you would email me a patch as I'm the current maintainer. There are several issues with your update though. I am working through them now, but it seems upstream has completely changed their custom GNU Makefile build system. Files have moved around, so lots of the steps you left in the port Makefile don't apply at all or needed to be changed. Still, the build does not complete for me at this time, currently working on that. It is not related to the SDL2 issue the other user mentioned :-) I'll submit a patch against current CVS. We will definitely need to maintain a patch against Makefile.common, as unfortunately upstream has made it impossible for us to properly override CC/CXX values in its current form. What platform did you get this successfully built on? I am seeing the below build failure on amd64. Cheers! -ryan build failure: c++ -fno-exceptions -fno-rtti -funswitch-loops -fomit-frame-pointer -funsigned-char -fno-strict-aliasing -fjump-tables -I/usr/local/include -I/usr/local/include/SDL2 -I/usr/X11R6/include -D_REENTRANT -I/usr/X11R6/include -O2 -pipe -DNDEBUG -W -Wall -Wextra -Wpointer-arith -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized -Wno-attributes -Wno-strict-overflow-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -DUSE_LIBPNG -DUSE_LIBVPX -DHAVE_VORBIS -DHAVE_FLAC -I/usr/local/include -DHAVE_INTTYPES -DSDL_TARGET=2 -DHAVE_GTK2 -I/usr/local/include/gtk-2.0 -I/usr/local/lib/gtk-2.0/include -I/usr/local/include/pango-1.0 -I/usr/local/include/gio-unix-2.0/ -I/usr/X11R6/include -I/usr/local/include/cairo -I/usr/local/include/atk-1.0 -I/usr/X11R6/include/pixman-1 -I/usr/local/include/libpng16 -I/usr/local/include/gdk-pixbuf-2.0 -pthread -I/usr/local/include/harfbuzz -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include/freetype2 -I/usr/include -I/usr/local/include -I/usr/local/include/SDL -DRENDERTYPESDL=1 -DMIXERTYPESDL=1 -DUSE_OPENGL -DNOASM -DPOLYMER -Ibuild/include -Isource/jmact -Isource/jaudiolib/include -Isource/enet/include -DHAS_SOCKLEN_T -c source/enet/src/peer.c -o obj/enet/peer.o source/enet/src/peer.c: In function 'void enet_peer_remove_incoming_commands(ENetList*, ENetListNode*, ENetListNode*)': source/enet/src/peer.c:275: error: 'UNREFERENCED_PARAMETER' was not declared in this scope Makefile:906: recipe for target 'obj/enet/peer.o' failed gmake: *** [obj/enet/peer.o] Error 1 gmake: *** Waiting for unfinished jobs rm obj/duke3d/game_banner.c obj/duke3d/build_banner.c *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2675 '/usr/obj/pobj/eduke32-2.0.0.5775/.build_done') *** Error 1 in /usr/ports/games/eduke32 (/usr/ports/infrastructure/mk/bsd.port.mk:2397 'all')
Re: [update] eduke32/5775
On 16-06-18 18:23:44, Daniel Wilkins wrote: > On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote: > > The old version was something like 3 years old and 2000 weeklies behind. > > I've talked to the dev and it now builds cleanly without patches(or rather, > > I made the changes needed and got it merged into the project.) > > > > Now it'll actually run the official expansions properly, as well as all the > > other additions since 2013. > > > > > > Sorry about that; apparently I forgot that they switched to SDL2 and didn't > update > the depends properly. Patch for the makefile below. > > > 28c28 > < WANTLIB = SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx > --- > > WANTLIB = c m pthread stdc++ vorbisfile vpx vorbis ogg png z FLAC SDL2 > > SDL2_mixer execinfo > 32,33c32,34 > < devel/sdl \ > < devel/sdl-mixer > --- > > devel/libexecinfo \ > > devel/sdl2 \ > > devel/sdl2-mixer > 37d37 > < WANTLIB +=gtk-x11-2.0 This fixed the build for me. Thanks, -- Edgar Pettijohn
Re: [update] eduke32/5775
On Sat, Jun 18, 2016 at 03:54:45PM -0400, Daniel Wilkins wrote: > The old version was something like 3 years old and 2000 weeklies behind. > I've talked to the dev and it now builds cleanly without patches(or rather, > I made the changes needed and got it merged into the project.) > > Now it'll actually run the official expansions properly, as well as all the > other additions since 2013. > > Sorry about that; apparently I forgot that they switched to SDL2 and didn't update the depends properly. Patch for the makefile below. 28c28 < WANTLIB = SDL c m pthread stdc++ SDL_mixer>=3 vorbisfile vpx --- > WANTLIB = c m pthread stdc++ vorbisfile vpx vorbis ogg png z FLAC SDL2 > SDL2_mixer execinfo 32,33c32,34 < devel/sdl \ < devel/sdl-mixer --- > devel/libexecinfo \ > devel/sdl2 \ > devel/sdl2-mixer 37d37 < WANTLIB +=gtk-x11-2.0
Re: [update] eduke32/5775
On 16-06-18 15:54:45, Daniel Wilkins wrote: > The old version was something like 3 years old and 2000 weeklies behind. > I've talked to the dev and it now builds cleanly without patches(or rather, > I made the changes needed and got it merged into the project.) > > Now it'll actually run the official expansions properly, as well as all the > other additions since 2013. >kefile:934: recipe for target 'obj/duke3d/game.o' failed I am getting the following when testing: gmake: *** [obj/duke3d/game.o] Error 1 *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2773 '/usr/ports/pobj/eduke32-2.0.0.5775/.build_done') *** Error 1 in /usr/ports/games/eduke32/eduke32 (/usr/ports/infrastructure/mk/bsd.port.mk:2495 'all') $uname -a OpenBSD thinkpad.my.domain 6.0 GENERIC.MP#1873 i386 -- Edgar Pettijohn
[update] eduke32/5775
The old version was something like 3 years old and 2000 weeklies behind. I've talked to the dev and it now builds cleanly without patches(or rather, I made the changes needed and got it merged into the project.) Now it'll actually run the official expansions properly, as well as all the other additions since 2013. eduke32.tar.gz Description: application/tar-gz
