ports/157355: [patch] add options to openttd
Ilya A. Arkhipov
micro at heavennet.ru
Thu May 26 20:50:09 UTC 2011
>Number: 157355
>Category: ports
>Synopsis: [patch] add options to openttd
>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: Thu May 26 20:50:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ilya A. Arkhipov
>Release: FreeBSD 9.0-CURRENT
>Organization:
>Environment:
FreeBSD micro 9.0-CURRENT FreeBSD 9.0-CURRENT #2: Fri Mar 18 07:11:37 UTC 2011 root at micro:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Patch add options to openttd:
DEDICATED "Build only dedicated server" on
OPENGFX "Build with OpenGFX(graphic)" off
OPENMSX "Build with OpenMSX(music)" off
OPENSFX "Build with OpenSFX(sound)" off
And little fix for:
$ port test -l
===> Validating port with portlint
looks fine.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nru openttd_26/Makefile openttd/Makefile
--- openttd_26/Makefile 2011-05-26 22:15:37.873818278 +0400
+++ openttd/Makefile 2011-05-26 23:24:46.166823115 +0400
@@ -18,16 +18,16 @@
MAINTAINER= danfe at FreeBSD.org
COMMENT= An open source clone of Microprose Transport Tycoon Deluxe
-LICENSE= GPLv2
-
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
lzo2.2:${PORTSDIR}/archivers/lzo2
-USE_XZ= yes
+LICENSE= GPLv2
+
+USE_XZ= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
USE_GMAKE= yes
-MAKE_ARGS= VERBOSE=1 # We want to see what's going on
+MAKE_ARGS= VERBOSE=1 # We want to see what's going on
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
@@ -35,14 +35,13 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CXXFLAGS= # Set to empty as OpenTTD treats it as an addition to CFLAGS
-.if defined(WITH_MIDI_PLAYER)
-CONFIGURE_ARGS+= --with-midi=${WITH_MIDI_PLAYER}
-.endif
-.if defined(WITH_MIDI_PLAYER_ARGS)
-CONFIGURE_ARGS+= --with-midi-arg=${WITH_MIDI_PLAYER_ARGS}
-.endif
-.if defined(WITH_DEDICATED_SERVER_ONLY)
-USE_GNOME= pkgconfig # Needed for liblzma support
+OPTIONS= DEDICATED "Build only dedicated server" on \
+ OPENGFX "Build with OpenGFX(graphic)" off \
+ OPENMSX "Build with OpenMSX(music)" off \
+ OPENSFX "Build with OpenSFX(sound)" off
+
+.if defined(WITH_DEDICATED)
+USE_GNOME= pkgconfig # Needed for liblzma support
CONFIGURE_ARGS+= --enable-dedicated
# Aid it to find lzo2 headers; client build gets it via sdl-config
CFLAGS+= -I${LOCALBASE}/include
@@ -53,11 +52,21 @@
USE_SDL= sdl
.endif
+.if defined(WITH_OPENGFX)
+RUN_DEPENDS+= ${LOCALBASE}/share/${PORTNAME}/data/opengfx/opengfx.obg:${PORTSDIR}/games/opengfx
+.endif
+.if defined(WITH_OPENMSX)
+RUN_DEPENDS+= ${LOCALBASE}/share/${PORTNAME}/gm/openmsx/openmsx.obm:${PORTSDIR}/games/openmsx
+.endif
+.if defined(WITH_OPENSFX)
+RUN_DEPENDS+= ${LOCALBASE}/share/${PORTNAME}/data/opensfx/opensfx.obs:${PORTSDIR}/games/opensfx
+.endif
+
SUB_FILES= pkg-message
MAN6= ${PORTNAME}.6
DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \
- "Game;Simulation;StrategyGame;" false
+ "Game;Simulation;StrategyGame;" ${FALSE}
PORTDOCS= 32bpp.txt HOWTO_compile_lang_files.txt admin_network.txt \
elrail.svg elrail_tile.png elrail_track.png landscape.html \
@@ -67,17 +76,6 @@
.include <bsd.port.pre.mk>
-pre-everything::
-.if !defined(WITH_MIDI_PLAYER)
- @${ECHO_MSG} "Define WITH_MIDI_PLAYER=/path/to/player to build with external MIDI player"
-.endif
-.if !defined(WITH_MIDI_PLAYER_ARGS)
- @${ECHO_MSG} "Define WITH_MIDI_PLAYER_ARGS=arguments for external MIDI player"
-.endif
-.if !defined(WITH_DEDICATED_SERVER_ONLY)
- @${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server"
-.endif
-
post-patch:
# Remove extra (vendor-provided) CFLAGS and LDFLAGS and make the port more
# LOCALBASE safe (don't forget to update XXXX,YYYYd part when upgrading!)
diff -Nru openttd_26/pkg-plist openttd/pkg-plist
--- openttd_26/pkg-plist 2011-05-26 22:15:37.885818127 +0400
+++ openttd/pkg-plist 2011-05-27 00:06:25.152915388 +0400
@@ -6,7 +6,7 @@
@dirrm %%DATADIR%%/ai
%%DATADIR%%/gm/no_music.obm
%%DATADIR%%/gm/orig_win.obm
- at dirrm %%DATADIR%%/gm
+ at dirrmtry %%DATADIR%%/gm
%%DATADIR%%/data/openttd.grf
%%DATADIR%%/data/opntitle.dat
%%DATADIR%%/data/orig_dos.obg
@@ -15,7 +15,7 @@
%%DATADIR%%/data/orig_win.obg
%%DATADIR%%/data/orig_win.obs
%%DATADIR%%/data/no_sound.obs
- at dirrm %%DATADIR%%/data
+ at dirrmtry %%DATADIR%%/data
%%DATADIR%%/lang/afrikaans.lng
%%DATADIR%%/lang/arabic_egypt.lng
%%DATADIR%%/lang/brazilian_portuguese.lng
@@ -75,7 +75,7 @@
%%DATADIR%%/scripts/pre_server.scr.example
%%DATADIR%%/scripts/readme.txt
@dirrm %%DATADIR%%/scripts
- at dirrm %%DATADIR%%
+ at dirrmtry %%DATADIR%%
share/icons/hicolor/16x16/apps/openttd.png
share/icons/hicolor/32x32/apps/openttd.png
share/icons/hicolor/48x48/apps/openttd.png
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list