diff options
Diffstat (limited to 'games/openttd')
| -rw-r--r-- | games/openttd/Makefile | 6 | ||||
| -rw-r--r-- | games/openttd/PLIST | 5 | ||||
| -rw-r--r-- | games/openttd/distinfo | 13 | ||||
| -rw-r--r-- | games/openttd/patches/patch-aa | 31 | ||||
| -rw-r--r-- | games/openttd/patches/patch-ab | 41 | ||||
| -rw-r--r-- | games/openttd/patches/patch-ac | 12 |
6 files changed, 42 insertions, 66 deletions
diff --git a/games/openttd/Makefile b/games/openttd/Makefile index d9b47610d80..6b02eb81e73 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/09/08 19:06:02 rpaulo Exp $ -DISTNAME= openttd-0.3.6-source -PKGNAME= openttd-0.3.6 +DISTNAME= openttd-0.4.0.1-source +PKGNAME= openttd-0.4.0.1 CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/} diff --git a/games/openttd/PLIST b/games/openttd/PLIST index c811b09bc26..c36a748285b 100644 --- a/games/openttd/PLIST +++ b/games/openttd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/30 15:12:48 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/09/08 19:06:02 rpaulo Exp $ bin/openttd share/games/openttd/data/autorail.grf share/games/openttd/data/canalsw.grf @@ -11,6 +11,7 @@ share/games/openttd/docs/changelog.txt share/games/openttd/docs/multiplayer.txt share/games/openttd/docs/readme.txt share/games/openttd/lang/american.lng +share/games/openttd/lang/brazilian_portuguese.lng share/games/openttd/lang/catalan.lng share/games/openttd/lang/czech.lng share/games/openttd/lang/danish.lng @@ -23,6 +24,8 @@ share/games/openttd/lang/german.lng share/games/openttd/lang/hungarian.lng share/games/openttd/lang/icelandic.lng share/games/openttd/lang/italian.lng +share/games/openttd/lang/latvian.lng +share/games/openttd/lang/lithuanian.lng share/games/openttd/lang/norwegian.lng share/games/openttd/lang/origveh.lng share/games/openttd/lang/polish.lng diff --git a/games/openttd/distinfo b/games/openttd/distinfo index 067110bb2c0..9b701784cd5 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/03/30 15:12:48 wiz Exp $ +$NetBSD: distinfo,v 1.2 2005/09/08 19:06:02 rpaulo Exp $ -SHA1 (openttd-0.3.6-source.tar.gz) = 0e76068e046b53cb31eb4b623e460a785d6d836b -RMD160 (openttd-0.3.6-source.tar.gz) = 0a562b33e5cb284173951d83e2865d9bb6c732d7 -Size (openttd-0.3.6-source.tar.gz) = 2511895 bytes -SHA1 (patch-aa) = 66de93f2353045b4f22243cbff036f61c2e6d5ce -SHA1 (patch-ab) = 273b476ef19c1e69be0a076f1c9bad85dae683b1 -SHA1 (patch-ac) = 2d89f01332b66431b2dc438fffcf9854071a46af +SHA1 (openttd-0.4.0.1-source.tar.gz) = 992d3d497161b63cb8de94f34ed63611e23ae08e +RMD160 (openttd-0.4.0.1-source.tar.gz) = 4bd07812c27cf7a637feaf92ee66ccdff56c6b65 +Size (openttd-0.4.0.1-source.tar.gz) = 2950778 bytes +SHA1 (patch-aa) = aebea9710752bd4b8a7f5562f0ee49ac8b071d68 +SHA1 (patch-ab) = 1353468886982f88180279319e704a70ace8301f diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-aa index d6dccc21d47..694b2c81911 100644 --- a/games/openttd/patches/patch-aa +++ b/games/openttd/patches/patch-aa @@ -1,30 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/03/30 15:12:48 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/08 19:06:03 rpaulo Exp $ ---- makefiledir/Makefile.libdetection.orig 2004-12-07 23:58:06.000000000 +0600 -+++ makefiledir/Makefile.libdetection -@@ -18,6 +18,11 @@ ifeq ($(shell uname),FreeBSD) - FREEBSD:=1 - endif +--- makefiledir/Makefile.libdetection.orig 2005-05-16 09:30:32.000000000 +0100 ++++ makefiledir/Makefile.libdetection 2005-09-07 22:45:41.000000000 +0100 +@@ -66,7 +66,7 @@ + WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null) -+# Automatically recognize if building on NetBSD -+ifeq ($(shell uname),NetBSD) -+NETBSD:=1 -+endif -+ - # Automatically recognize if building on MacOSX - ifeq ($(VENDOR), apple) - OSX:=1 -@@ -75,8 +80,13 @@ ifdef WITH_PNG - WITH_PNG:=1 - endif - else -+ifdef NETBSD -+# NetBSD uses generic pkg-config instead of libpng-config + # libpng detection +-WITH_PNG:=$(shell libpng-config --version 2>/dev/null) +WITH_PNG:=$(shell pkg-config --version libpng12 2>/dev/null) -+else - WITH_PNG:=$(shell libpng-config --version 2>/dev/null) - endif -+endif ifdef WITH_PNG # LibPNG depends on Zlib diff --git a/games/openttd/patches/patch-ab b/games/openttd/patches/patch-ab index 58a4d36593a..fe84877584f 100644 --- a/games/openttd/patches/patch-ab +++ b/games/openttd/patches/patch-ab @@ -1,24 +1,27 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/03/30 15:12:48 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2005/09/08 19:06:03 rpaulo Exp $ ---- Makefile.orig 2005-01-25 06:07:50.000000000 +0600 -+++ Makefile -@@ -434,6 +434,11 @@ CDEFS += -DWITH_PNG - ifdef FREEBSD - LIBS += -lpng - else -+ifdef NETBSD -+# NetBSD uses pkg-config -+LIBS += `pkg-config --libs libpng12` -+CFLAGS += `pkg-config --cflags libpng12` -+else - CFLAGS += `libpng-config --cflags` +--- Makefile.orig 2005-05-21 23:39:44.000000000 +0100 ++++ Makefile 2005-09-07 23:27:16.000000000 +0100 +@@ -458,19 +458,12 @@ + # libpng config + ifdef WITH_PNG + CDEFS += -DWITH_PNG +-CFLAGS += $(shell libpng-config --cflags) ++CFLAGS += $(shell pkg-config --cflags libpng12) - # seems like older libpng versions are broken and need this -@@ -450,6 +455,7 @@ LIBS += `libpng-config --L_opts $(PNGCO - endif +-# seems like older libpng versions are broken and need this +-PNGCONFIG_FLAGS = --ldflags --libs + ifdef STATIC +-ifdef OSX +-# Seems like we need a tiny hack for OSX static to work +-LIBS += $(shell libpng-config --prefix)/lib/libpng.a +-else +-LIBS += $(shell libpng-config --static $(PNGCONFIG_FLAGS)) +-endif ++LIBS += $(shell pkg-config --static libpng12) + else +-LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS)) ++LIBS += $(shell pkg-config --libs libpng12) endif endif -+endif - # enables/disables assert() - ifdef DISABLE_ASSERTS diff --git a/games/openttd/patches/patch-ac b/games/openttd/patches/patch-ac deleted file mode 100644 index 1efc2bfbf39..00000000000 --- a/games/openttd/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2005/03/30 15:12:48 wiz Exp $ - ---- makefiledir/Makefile.config_writer.orig 2004-12-24 06:33:41.000000000 +0600 -+++ makefiledir/Makefile.config_writer -@@ -80,6 +80,7 @@ $(MAKE_CONFIG): - $(call CONFIG_LINE,UNIX:=$(UNIX)) - $(call CONFIG_LINE,OSX:=$(OSX)) - $(call CONFIG_LINE,FREEBSD:=$(FREEBSD)) -+ $(call CONFIG_LINE,NETBSD:=$(NETBSD)) - $(call CONFIG_LINE,MORPHOS:=$(MORPHOS)) - $(call CONFIG_LINE,BEOS:=$(BEOS)) - $(call CONFIG_LINE,SUNOS:=$(SUNOS)) |