ports/185171: [patch] Update games/deng to 1.12.2
Max Sterling
maxclsb at gmail.com
Wed Dec 25 03:30:01 UTC 2013
>Number: 185171
>Category: ports
>Synopsis: [patch] Update games/deng to 1.12.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 25 03:30:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Max Sterling
>Release: 9.1
>Organization:
>Environment:
FreeBSD marvin 9.1-STABLE FreeBSD 9.1-STABLE #0 r246344: Tue Feb 5 00:46:08 MST 2013 root at marvin:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Updated games/deng to 1.12.2.
It now builds with qmake instead of cmake.
Added pkg-message to inform the user of an important command line flag not yet documented in the man page.
Added LICENSE.
Removed file:
files/patch-gl_png.c
Added files:
files/patch-doomsday-config__unix.pri
files/patch-doomsday-dep__zlib.pri
pkg-message
This port should probably be renamed to games/doomsday because the distfiles and default upstream install paths now use "doomsday" instead of "deng".
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 337399)
+++ Makefile (working copy)
@@ -2,15 +2,16 @@
# $FreeBSD$
PORTNAME= deng
-PORTVERSION= 1.9.0b6.9
-PORTREVISION= 3
+PORTVERSION= 1.12.2
CATEGORIES= games
-MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta6.9
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/}
+MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/${PORTVERSION}
+DISTNAME= doomsday-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= Enhanced Doom, Heretic, and Hexen source port
+LICENSE= GPLv2
+
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
libpng15.so:${PORTSDIR}/graphics/png
@@ -21,12 +22,18 @@
USE_SDL= sdl mixer net
USE_XORG= x11
USE_PYTHON= yes
-USES= cmake:outsource
-CMAKE_SOURCE_PATH= ${WRKSRC}/doomsday
+USES= qmake pkgconfig
+USE_QT4= qmake_build
+QMAKE_SOURCE_PATH= ${WRKSRC}/doomsday
CFLAGS+= -I${LOCALBASE}/include/libpng15
-CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--export-dynamic"
+QMAKE_ARGS+= QMAKE_LFLAGS+="-Wl,--export-dynamic" \
+ CONFIG+="deng_notools deng_nosnowberry"
LDFLAGS+= -lm
+CONFIGURE_WRKSRC= ${WRKDIR}/build
+BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
+
OPTIONS_DEFINE= OPENAL DOCS
OPTIONS_DEFAULT= DOCS
OPENAL_DESC= Build OpenAL sound plugin
@@ -35,25 +42,22 @@
.if ${PORT_OPTIONS:MOPENAL}
USE_OPENAL= al
-CMAKE_ARGS+= -DBUILDOPENAL:BOOL=ON
+QMAKE_ARGS+= CONFIG+=deng_openal
PLIST_SUB= OPENAL=""
.else
-CMAKE_ARGS+= -DBUILDOPENAL:BOOL=OFF
+QMAKE_ARGS+= CONFIG+=deng_noopenal
PLIST_SUB= OPENAL="@comment "
.endif
-post-patch:
- ${REINPLACE_CMD} \
- -e '/CHECK_LIBRARY_EXIST/s/dl//' \
- -e '/TARGET_LINK_LIBRARIES/s/dl//' \
- ${WRKSRC}/doomsday/CMakeLists.txt
+pre-configure:
+ ${MKDIR} ${CONFIGURE_WRKSRC}
post-install:
${LN} -s doomsday ${STAGEDIR}${PREFIX}/bin/deng
- ${INSTALL_MAN} ${WRKSRC}/doomsday/engine/doc/doomsday.6 ${STAGEDIR}${MANPREFIX}/man/man6/
+ ${INSTALL_MAN} ${WRKSRC}/doomsday/doc/output/doomsday.6 ${STAGEDIR}${MANPREFIX}/man/man6/
@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in LICENSE changelog.txt cnsname.txt cvars.txt deddoc.txt dhistory.txt naming.txt network.txt
- ${INSTALL_DATA} ${WRKSRC}/doomsday/engine/doc/${i} ${STAGEDIR}${DOCSDIR}/
+.for i in changelog.txt dhistory.txt
+ ${INSTALL_DATA} ${WRKSRC}/doomsday/client/doc/changelogs/${i} ${STAGEDIR}${DOCSDIR}/
.endfor
.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo (revision 337399)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (deng-1.9.0-beta6.9.tar.gz) = 3553f6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af
-SIZE (deng-1.9.0-beta6.9.tar.gz) = 6085833
+SHA256 (doomsday-1.12.2.tar.gz) = a021fd1d7540b43075b0906167c45e82fe698105222613097befdeb793363a4e
+SIZE (doomsday-1.12.2.tar.gz) = 13028633
Index: files/patch-doomsday-config__unix.pri
===================================================================
--- files/patch-doomsday-config__unix.pri (revision 0)
+++ files/patch-doomsday-config__unix.pri (working copy)
@@ -0,0 +1,20 @@
+--- doomsday/config_unix.pri.orig 2013-12-24 05:39:13.000000000 -0700
++++ doomsday/config_unix.pri 2013-12-24 05:40:08.000000000 -0700
+@@ -43,7 +43,7 @@
+ }
+
+ # Target location for plugin libraries.
+-DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/doomsday
++DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/deng
+
+ # When installing libraries to a non-standard location, instruct
+ # the linker where to find them.
+@@ -51,7 +51,7 @@
+ QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
+ }
+
+-DENG_BASE_DIR = $$PREFIX/share/doomsday
++DENG_BASE_DIR = $$PREFIX/share/deng
+ DENG_DATA_DIR = $$DENG_BASE_DIR/data
+
+ DEFINES += DENG_BASE_DIR=\"\\\"$${DENG_BASE_DIR}/\\\"\"
Property changes on: files/patch-doomsday-config__unix.pri
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-doomsday-dep__zlib.pri
===================================================================
--- files/patch-doomsday-dep__zlib.pri (revision 0)
+++ files/patch-doomsday-dep__zlib.pri (working copy)
@@ -0,0 +1,13 @@
+--- doomsday/dep_zlib.pri.orig 2013-11-02 07:38:18.000000000 -0700
++++ doomsday/dep_zlib.pri 2013-12-24 04:55:18.000000000 -0700
+@@ -12,6 +12,10 @@
+ # Mac OS X.
+ LIBS += -lz
+ }
++else:freebsd-* {
++ # FreeBSD
++ LIBS += -lz
++}
+ else {
+ # Generic Unix.
+ QMAKE_CFLAGS += $$system(pkg-config zlib --cflags)
Property changes on: files/patch-doomsday-dep__zlib.pri
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-gl_png.c
===================================================================
--- files/patch-gl_png.c (revision 337399)
+++ files/patch-gl_png.c (working copy)
@@ -1,10 +0,0 @@
---- doomsday/engine/portable/src/gl_png.c.orig 2010-04-07 22:52:50.000000000 +0200
-+++ doomsday/engine/portable/src/gl_png.c 2012-04-29 06:31:36.000000000 +0200
-@@ -32,6 +32,7 @@
- // HEADER FILES ------------------------------------------------------------
-
- #include <png.h>
-+#include <pngpriv.h>
- #include <setjmp.h>
-
- #include "de_base.h"
Index: pkg-message
===================================================================
--- pkg-message (revision 0)
+++ pkg-message (working copy)
@@ -0,0 +1,7 @@
+========================================================================
+
+If you use an Intel graphics adapter and experience missing or
+corrupted textures during gameplay, try launching doomsday with the
+"-notexcomp" option.
+
+========================================================================
Property changes on: pkg-message
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist (revision 337399)
+++ pkg-plist (working copy)
@@ -1,27 +1,92 @@
bin/deng
bin/doomsday
+bin/doomsday-server
+%%OPENAL%%lib/deng/libaudio_openal.so
+%%OPENAL%%lib/deng/libaudio_openal.so.1
+%%OPENAL%%lib/deng/libaudio_openal.so.1.2
+%%OPENAL%%lib/deng/libaudio_openal.so.1.2.4
+lib/deng/libdehread.so
+lib/deng/libdehread.so.2
+lib/deng/libdehread.so.2.0
+lib/deng/libdehread.so.2.0.0
+lib/deng/libdoom.so
+lib/deng/libdoom.so.1
+lib/deng/libdoom.so.1.12
+lib/deng/libdoom.so.1.12.2
+lib/deng/libdoom64.so
+lib/deng/libdoom64.so.1
+lib/deng/libdoom64.so.1.12
+lib/deng/libdoom64.so.1.12.2
+lib/deng/libexample.so
+lib/deng/libexample.so.1
+lib/deng/libexample.so.1.2
+lib/deng/libexample.so.1.2.0
+lib/deng/libheretic.so
+lib/deng/libheretic.so.1
+lib/deng/libheretic.so.1.12
+lib/deng/libheretic.so.1.12.2
+lib/deng/libhexen.so
+lib/deng/libhexen.so.1
+lib/deng/libhexen.so.1.12
+lib/deng/libhexen.so.1.12.2
+lib/deng/libwadmapconverter.so
+lib/deng/libwadmapconverter.so.1
+lib/deng/libwadmapconverter.so.1.1
+lib/deng/libwadmapconverter.so.1.1.0
+lib/libdeng1.so
+lib/libdeng1.so.1
+lib/libdeng1.so.1.12
+lib/libdeng1.so.1.12.2
+lib/libdeng2.so
+lib/libdeng2.so.2
+lib/libdeng2.so.2.0
+lib/libdeng2.so.2.0.0
+lib/libdeng_gui.so
+lib/libdeng_gui.so.1
+lib/libdeng_gui.so.1.12
+lib/libdeng_gui.so.1.12.2
+lib/libdeng_shell.so
+lib/libdeng_shell.so.0
+lib/libdeng_shell.so.0.1
+lib/libdeng_shell.so.0.1.0
man/man6/doomsday.6.gz
-lib/libdpdehread.so
-lib/libdpwadmapconverter.so
-%%OPENAL%%lib/libdsopenal.so
-lib/libjdoom.so
-lib/libjheretic.so
-lib/libjhexen.so
-%%DATADIR%%/data/doomsday.pk3
-%%DATADIR%%/data/jdoom/jdoom.pk3
-%%DATADIR%%/data/jheretic/jheretic.pk3
-%%DATADIR%%/data/jhexen/jhexen.pk3
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/cnsname.txt
-%%PORTDOCS%%%%DOCSDIR%%/cvars.txt
-%%PORTDOCS%%%%DOCSDIR%%/deddoc.txt
%%PORTDOCS%%%%DOCSDIR%%/dhistory.txt
-%%PORTDOCS%%%%DOCSDIR%%/naming.txt
-%%PORTDOCS%%%%DOCSDIR%%/network.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%DATADIR%%/data/jdoom
- at dirrm %%DATADIR%%/data/jhexen
- at dirrm %%DATADIR%%/data/jheretic
- at dirrm %%DATADIR%%/data
- at dirrm %%DATADIR%%
+%%DATADIR%%/data/doomsday.pk3
+%%DATADIR%%/data/fonts/console11.dfn
+%%DATADIR%%/data/fonts/console14.dfn
+%%DATADIR%%/data/fonts/console18.dfn
+%%DATADIR%%/data/fonts/normal12.dfn
+%%DATADIR%%/data/fonts/normal18.dfn
+%%DATADIR%%/data/fonts/normal24.dfn
+%%DATADIR%%/data/fonts/normalbold12.dfn
+%%DATADIR%%/data/fonts/normalbold18.dfn
+%%DATADIR%%/data/fonts/normalbold24.dfn
+%%DATADIR%%/data/fonts/normallight12.dfn
+%%DATADIR%%/data/fonts/normallight18.dfn
+%%DATADIR%%/data/fonts/normallight24.dfn
+%%DATADIR%%/data/graphics/background.pcx
+%%DATADIR%%/data/graphics/loading1.png
+%%DATADIR%%/data/graphics/loading2.png
+%%DATADIR%%/data/graphics/logo.png
+%%DATADIR%%/data/jdoom/libdoom.pk3
+%%DATADIR%%/data/jdoom64/libdoom64.pk3
+%%DATADIR%%/data/jheretic/libheretic.pk3
+%%DATADIR%%/data/jhexen/libhexen.pk3
+%%DATADIR%%/modules/Config.de
+%%DATADIR%%/modules/appconfig.de
+%%DATADIR%%/modules/bootstrap.de
+%%DATADIR%%/modules/gui.de
+%%DATADIR%%/modules/recutil.de
+share/man/man6/doomsday.6
+ at dirrmtry %%DATADIR%%/modules
+ at dirrmtry %%DATADIR%%/data/jhexen
+ at dirrmtry %%DATADIR%%/data/jheretic
+ at dirrmtry %%DATADIR%%/data/jdoom64
+ at dirrmtry %%DATADIR%%/data/jdoom
+ at dirrmtry %%DATADIR%%/data/graphics
+ at dirrmtry %%DATADIR%%/data/fonts
+ at dirrmtry %%DATADIR%%/data
+ at dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrmtry lib/deng
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list