Date: Tue, 8 Apr 2008 02:14:39 GMT From: Artem Naluzhnyy <tut@nhamon.com.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/122550: [patch] games/openttd: update to 0.6.0 Message-ID: <200804080214.m382Ed5C084461@www.freebsd.org> Resent-Message-ID: <200804080220.m382K0Zm027705@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122550
>Category: ports
>Synopsis: [patch] games/openttd: update to 0.6.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 08 02:20:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Artem Naluzhnyy
>Release: 7.0-STABLE
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
diff -ruN openttd.bak/Makefile openttd/Makefile
--- openttd.bak/Makefile 2008-04-02 13:55:44.000000000 +0300
+++ openttd/Makefile 2008-04-08 04:39:17.000000000 +0300
@@ -6,8 +6,7 @@
#
PORTNAME= openttd
-PORTVERSION= 0.5.3
-PORTREVISION= 2
+PORTVERSION= 0.6.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,34 +16,36 @@
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
+GNU_CONFIGURE= yes
USE_GMAKE= yes
+INSTALLS_ICONS= yes
DISTVERSIONSUFFIX= -source
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+CONFIGURE_ARGS= --data-dir=share/openttd
+
.if defined(WITH_MIDI_PLAYER)
-MAKE_ARGS+= MIDI=${WITH_MIDI_PLAYER}
+CONFIGURE_ARGS+= --with-midi=${WITH_MIDI_PLAYER}
.endif
+
.if defined(WITH_DEDICATED_SERVER_ONLY)
-MAKE_ARGS+= DEDICATED=1
+CONFIGURE_ARGS+= --enable-dedicated
.else
USE_SDL= sdl
.endif
-MAKE_ARGS+= RELEASE=${PORTVERSION} DATA_DIR="share/openttd" \
- USE_HOMEDIR=1 PERSONAL_DIR=.openttd INSTALL=1 VERBOSE=1 \
- PTHREAD_LIBS="-lpthread"
-
SUB_FILES= pkg-message
MAN6= openttd.6
-DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "" "openttd" "" false
+DESKTOP_ENTRIES= "OpenTTD" "${COMMENT}" "openttd" "openttd" \
+ "Game;Simulation;StrategyGame;" false
-DOCS= HOWTO_compile_lang_files.txt Howto_compile_lng_files_from_CLI.txt \
- Manual.txt elrail.svg elrail_tile.png elrail_track.png \
- landscape.html landscape_grid.html multiplayer.txt \
- ottd-colour-palette.gif ottd-colourtext-palette.png tileh.png
+DOCS= 32bpp.txt HOWTO_compile_lang_files.txt Manual.txt elrail.svg \
+ elrail_tile.png elrail_track.png landscape.html \
+ landscape_grid.html multiplayer.txt ottd-colour-palette.gif \
+ ottd-colourtext-palette.png tileh.png
pre-everything::
.if !defined(WITH_MIDI_PLAYER)
@@ -54,21 +55,25 @@
@${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server"
.endif
-post-extract:
-.if defined(WITH_DEDICATED_SERVER_ONLY)
- @${REINPLACE_CMD} -e 's|^WITH_SDL|#WITH_SDL|' ${WRKSRC}/makefiledir/Makefile.libdetection
-.endif
-
do-install:
- @${MKDIR} ${DATADIR}/data ${DATADIR}/lang
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data
- ${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${DATADIR}/lang
- ${INSTALL_MAN} ${WRKSRC}/docs/${MAN6} ${MANPREFIX}/man/man6
+ @${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
+ @${MKDIR} ${DATADIR}/gm ${DATADIR}/data ${DATADIR}/lang ${DATADIR}/scripts
+ @${INSTALL_DATA} ${WRKSRC}/bin/data/* ${DATADIR}/data
+ @${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${DATADIR}/lang
+ @${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${DATADIR}/scripts
+
+.for n in 16 32 48 64 128 256
+ @${MKDIR} ${PREFIX}/share/icons/hicolor/${n}x${n}/apps
+ @${INSTALL_DATA} ${WRKSRC}/media/openttd.${n}.png \
+ ${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png
+.endfor
+
+ @${INSTALL_MAN} ${WRKSRC}/docs/${MAN6} ${MANPREFIX}/man/man6
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
. for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
. endfor
.endif
diff -ruN openttd.bak/distinfo openttd/distinfo
--- openttd.bak/distinfo 2008-04-02 13:55:44.000000000 +0300
+++ openttd/distinfo 2008-04-02 13:59:01.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (openttd-0.5.3-source.tar.gz) = 609bd6a728987326cb0293994185e490
-SHA256 (openttd-0.5.3-source.tar.gz) = 0327028653af2b8e2aa90c83ead83b4487792bbfbee3b5bbd15f7ed8907ee70d
-SIZE (openttd-0.5.3-source.tar.gz) = 4114053
+MD5 (openttd-0.6.0-source.tar.gz) = be5b7aff98ae33de51fe64f498fb4ce1
+SHA256 (openttd-0.6.0-source.tar.gz) = 18b043d50c7a9c52a45fb5f1d12f8ebe9b930997c9ebfc6481c00e1119433fe4
+SIZE (openttd-0.6.0-source.tar.gz) = 4951665
diff -ruN openttd.bak/files/patch-Makefile openttd/files/patch-Makefile
--- openttd.bak/files/patch-Makefile 2008-04-02 13:55:44.000000000 +0300
+++ openttd/files/patch-Makefile 1970-01-01 03:00:00.000000000 +0300
@@ -1,29 +0,0 @@
---- Makefile.orig Mon Mar 27 02:32:00 2006
-+++ Makefile Fri Jun 16 04:30:11 2006
-@@ -213,7 +213,7 @@
- ifndef WIN32
- ifndef MORPHOS
- ifndef OSX
-- LDFLAGS+=-lpthread
-+ LDFLAGS+=${PTHREAD_LIBS}
- endif
- endif
- endif
-@@ -319,7 +319,7 @@
- # GNU make can only test for (in)equality
- # this is a workaround to test for >=
- ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
-- CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wundef
-+ CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wundef
- CC_CFLAGS += -Wstrict-prototypes
- CFLAGS += -Wwrite-strings -Wpointer-arith
- endif
-@@ -377,8 +377,6 @@
- ifdef MORPHOS
- BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
- BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple
--else
--BASECFLAGS += -O2
- endif
- ifndef PROFILE
- ifndef IRIX
diff -ruN openttd.bak/files/patch-config.lib openttd/files/patch-config.lib
--- openttd.bak/files/patch-config.lib 1970-01-01 03:00:00.000000000 +0300
+++ openttd/files/patch-config.lib 2008-04-08 02:04:09.000000000 +0300
@@ -0,0 +1,35 @@
+--- config.lib.orig 2008-04-01 01:31:33.000000000 +0300
++++ config.lib 2008-04-08 02:01:43.000000000 +0300
+@@ -181,6 +181,7 @@
+
+ --prefix-dir) prevp_p="prefix-dir";;
+ --prefix-dir=*) prefix_dir="$optarg";;
++ --prefix=*) prefix_dir="$optarg";;
+
+ --binary-dir) prevp_p="binary-dir";;
+ --binary-dir=*) binary_dir="$optarg";;
+@@ -875,7 +876,7 @@
+ LDFLAGS="$LDFLAGS -noixemul"
+ fi
+
+- CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
++# CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
+ fi
+ else
+ OBJS_SUBDIR="debug"
+@@ -906,6 +907,7 @@
+ CFLAGS="$CFLAGS -DNO_THREADS"
+ fi
+
++: <<'COMMENTS'
+ if [ `echo $cc_host | cut -c 1-3` = "icc" ]; then
+ # Enable some things only for certain ICC versions
+ cc_version=`$cc_host -dumpversion | cut -c 1-4`
+@@ -971,6 +973,7 @@
+ CFLAGS="$CFLAGS -fno-strict-overflow"
+ fi
+ fi
++COMMENTS
+
+ if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
+ LIBS="$LIBS -lpthread"
diff -ruN openttd.bak/files/pkg-message.in openttd/files/pkg-message.in
--- openttd.bak/files/pkg-message.in 2008-04-02 13:55:44.000000000 +0300
+++ openttd/files/pkg-message.in 2008-04-08 05:03:26.000000000 +0300
@@ -1,7 +1,7 @@
==========================================================================
- OpenTTD requires the original Windows version of "Transport Tycoon
- Deluxe" data files in order to function. Copy the following files
+ 1. OpenTTD requires the original Windows version of "Transport Tycoon
+ Deluxe" data files in order to function. Copy the following files
to %%DATADIR%%/data/ directory:
sample.cat
@@ -11,15 +11,22 @@
trgir.grf
trgtr.grf
- If you are using a non-latin language, you may see lots of `?'s on
- the screen. Please open your configuration file and add a desired
- fonts (file name with full path). Bold fonts might look better:
+ 2. If you are using a non-latin language, you may see lots of `?'s on
+ the screen. You should update your ~/.openttd/openttd.cfg configuration
+ file and add desired fonts (file name with full path). Bold fonts might
+ look better.
[misc]
small_font =
medium_font =
large_font =
- Enjoy!!
+ 3. To enable Generic Tram Set update your ~/.openttd/openttd.cfg
+ configuration file in the following way:
+
+ [newgrf]
+ generictrams_v0.4.grf
+
+ See also some documentation in %%DOCSDIR%%
==========================================================================
diff -ruN openttd.bak/pkg-plist openttd/pkg-plist
--- openttd.bak/pkg-plist 2008-04-02 13:55:44.000000000 +0300
+++ openttd/pkg-plist 2008-04-08 04:29:24.000000000 +0300
@@ -1,63 +1,88 @@
bin/openttd
-%%DATADIR%%/data/2ccmap.grf
-%%DATADIR%%/data/airports.grf
-%%DATADIR%%/data/autorail.grf
-%%DATADIR%%/data/canalsw.grf
-%%DATADIR%%/data/dosdummy.grf
-%%DATADIR%%/data/elrailsw.grf
-%%DATADIR%%/data/nsignalsw.grf
-%%DATADIR%%/data/openttd.grf
-%%DATADIR%%/data/opntitle.dat
-%%DATADIR%%/data/trkfoundw.grf
-@dirrm %%DATADIR%%/data
-%%DATADIR%%/lang/american.lng
-%%DATADIR%%/lang/brazilian_portuguese.lng
-%%DATADIR%%/lang/bulgarian.lng
-%%DATADIR%%/lang/catalan.lng
-%%DATADIR%%/lang/croatian.lng
-%%DATADIR%%/lang/czech.lng
-%%DATADIR%%/lang/danish.lng
-%%DATADIR%%/lang/dutch.lng
-%%DATADIR%%/lang/english.lng
-%%DATADIR%%/lang/esperanto.lng
-%%DATADIR%%/lang/estonian.lng
-%%DATADIR%%/lang/finnish.lng
-%%DATADIR%%/lang/french.lng
-%%DATADIR%%/lang/galician.lng
-%%DATADIR%%/lang/german.lng
-%%DATADIR%%/lang/hungarian.lng
-%%DATADIR%%/lang/icelandic.lng
-%%DATADIR%%/lang/italian.lng
-%%DATADIR%%/lang/japanese.lng
-%%DATADIR%%/lang/korean.lng
-%%DATADIR%%/lang/lithuanian.lng
-%%DATADIR%%/lang/norwegian_bokmal.lng
-%%DATADIR%%/lang/norwegian_nynorsk.lng
-%%DATADIR%%/lang/origveh.lng
-%%DATADIR%%/lang/polish.lng
-%%DATADIR%%/lang/portuguese.lng
-%%DATADIR%%/lang/romanian.lng
-%%DATADIR%%/lang/russian.lng
-%%DATADIR%%/lang/simplified_chinese.lng
-%%DATADIR%%/lang/slovak.lng
-%%DATADIR%%/lang/slovenian.lng
-%%DATADIR%%/lang/spanish.lng
-%%DATADIR%%/lang/swedish.lng
-%%DATADIR%%/lang/traditional_chinese.lng
-%%DATADIR%%/lang/turkish.lng
-%%DATADIR%%/lang/ukrainian.lng
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/HOWTO_compile_lang_files.txt
-%%PORTDOCS%%%%DOCSDIR%%/Howto_compile_lng_files_from_CLI.txt
-%%PORTDOCS%%%%DOCSDIR%%/Manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/elrail.svg
-%%PORTDOCS%%%%DOCSDIR%%/elrail_tile.png
-%%PORTDOCS%%%%DOCSDIR%%/elrail_track.png
-%%PORTDOCS%%%%DOCSDIR%%/landscape.html
-%%PORTDOCS%%%%DOCSDIR%%/landscape_grid.html
-%%PORTDOCS%%%%DOCSDIR%%/multiplayer.txt
-%%PORTDOCS%%%%DOCSDIR%%/ottd-colour-palette.gif
-%%PORTDOCS%%%%DOCSDIR%%/ottd-colourtext-palette.png
-%%PORTDOCS%%%%DOCSDIR%%/tileh.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/doc/openttd/32bpp.txt
+share/doc/openttd/HOWTO_compile_lang_files.txt
+share/doc/openttd/Manual.txt
+share/doc/openttd/elrail.svg
+share/doc/openttd/elrail_tile.png
+share/doc/openttd/elrail_track.png
+share/doc/openttd/landscape.html
+share/doc/openttd/landscape_grid.html
+share/doc/openttd/multiplayer.txt
+share/doc/openttd/ottd-colour-palette.gif
+share/doc/openttd/ottd-colourtext-palette.png
+share/doc/openttd/tileh.png
+share/icons/hicolor/128x128/apps/openttd.png
+share/icons/hicolor/16x16/apps/openttd.png
+share/icons/hicolor/256x256/apps/openttd.png
+share/icons/hicolor/32x32/apps/openttd.png
+share/icons/hicolor/48x48/apps/openttd.png
+share/icons/hicolor/64x64/apps/openttd.png
+share/openttd/data/generictrams_v0.4.grf
+share/openttd/data/openttdd.grf
+share/openttd/data/openttdw.grf
+share/openttd/data/opntitle.dat
+share/openttd/lang/afrikaans.lng
+share/openttd/lang/brazilian_portuguese.lng
+share/openttd/lang/bulgarian.lng
+share/openttd/lang/catalan.lng
+share/openttd/lang/croatian.lng
+share/openttd/lang/czech.lng
+share/openttd/lang/danish.lng
+share/openttd/lang/dutch.lng
+share/openttd/lang/english.lng
+share/openttd/lang/english_US.lng
+share/openttd/lang/esperanto.lng
+share/openttd/lang/estonian.lng
+share/openttd/lang/finnish.lng
+share/openttd/lang/french.lng
+share/openttd/lang/galician.lng
+share/openttd/lang/german.lng
+share/openttd/lang/hungarian.lng
+share/openttd/lang/icelandic.lng
+share/openttd/lang/italian.lng
+share/openttd/lang/japanese.lng
+share/openttd/lang/korean.lng
+share/openttd/lang/lithuanian.lng
+share/openttd/lang/norwegian_bokmal.lng
+share/openttd/lang/norwegian_nynorsk.lng
+share/openttd/lang/origveh.lng
+share/openttd/lang/piglatin.lng
+share/openttd/lang/polish.lng
+share/openttd/lang/portuguese.lng
+share/openttd/lang/romanian.lng
+share/openttd/lang/russian.lng
+share/openttd/lang/simplified_chinese.lng
+share/openttd/lang/slovak.lng
+share/openttd/lang/slovenian.lng
+share/openttd/lang/spanish.lng
+share/openttd/lang/swedish.lng
+share/openttd/lang/traditional_chinese.lng
+share/openttd/lang/turkish.lng
+share/openttd/lang/ukrainian.lng
+share/openttd/scripts/autoexec.scr.example
+share/openttd/scripts/on_client.scr.example
+share/openttd/scripts/on_dedicated.scr.example
+share/openttd/scripts/on_server.scr.example
+share/openttd/scripts/pre_dedicated.scr.example
+share/openttd/scripts/pre_server.scr.example
+share/openttd/scripts/readme.txt
+@dirrm share/openttd/scripts
+@dirrm share/openttd/lang
+@dirrm share/openttd/gm
+@dirrm share/openttd/data
+@dirrm share/openttd
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm share/doc/openttd
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804080214.m382Ed5C084461>