From ea15585cce5188df7bb58457542be5d94607f985 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 2 Mar 2004 16:43:49 +0000 Subject: Changes 1.12.0: * Code clean-up * Move to sourceforge.net --- games/lincity/Makefile | 32 +++++++-------- games/lincity/PLIST | 18 +++++++- games/lincity/distinfo | 9 ++-- games/lincity/patches/patch-aa | 93 ------------------------------------------ games/lincity/patches/patch-ab | 12 ------ games/lincity/patches/patch-ac | 23 ----------- 6 files changed, 34 insertions(+), 153 deletions(-) delete mode 100644 games/lincity/patches/patch-aa delete mode 100644 games/lincity/patches/patch-ab delete mode 100644 games/lincity/patches/patch-ac (limited to 'games/lincity') diff --git a/games/lincity/Makefile b/games/lincity/Makefile index 5cb30c7de3d..e55900aee32 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -1,27 +1,25 @@ -# $NetBSD: Makefile,v 1.10 2002/09/23 10:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/03/02 16:43:49 adam Exp $ # -DISTNAME= lincity-1.11 -CATEGORIES= games x11 -MASTER_SITES= ${MASTER_SITE_SUNSITE:=games/strategy/} \ - ftp://ftp.demon.co.uk/pub/unix/linux/games/ +DISTNAME= lincity-1.12.0 +CATEGORIES= games x11 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lincity/} \ + http://www.ibiblio.org/pub/Linux/games/strategy/ -MAINTAINER= root@garbled.net -HOMEPAGE= http://www.floot.demon.co.uk/lincity.html -COMMENT= Free clone of SimCity for X11 +MAINTAINER= root@garbled.net +HOMEPAGE= http://lincity.sourceforge.net/ +COMMENT= Free clone of SimCity for X11 -USE_BUILDLINK2= # defined -USE_X11BASE= # defined +BUILD_USES_MSGFMT= yes -ALL_TARGET= xlincity -INSTALL_TARGET= install-xlincity install-lib install-man - -MAKE_ENV+= EXTRA_OPTS="${CFLAGS}" - -pre-build: - ${LN} -sf lincity.man ${WRKSRC}/xlincity.man +USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make +USE_PKGLOCALEDIR= yes +USE_X11= yes +GNU_CONFIGURE= yes post-install: ${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6 +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lincity/PLIST b/games/lincity/PLIST index 496431df57b..dbc0556e464 100644 --- a/games/lincity/PLIST +++ b/games/lincity/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:53:57 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/03/02 16:43:50 adam Exp $ bin/xlincity man/man6/lincity.6 man/man6/xlincity.6 @@ -22,18 +22,22 @@ share/lincity/help/farm.hlp share/lincity/help/fast.hlp share/lincity/help/finance.hlp share/lincity/help/firestation.hlp +share/lincity/help/fonttest.hlp share/lincity/help/food.hlp share/lincity/help/goods.hlp share/lincity/help/health.hlp +share/lincity/help/housing.hlp share/lincity/help/index.hlp share/lincity/help/industryh.hlp share/lincity/help/industryl.hlp share/lincity/help/infowin.hlp share/lincity/help/jobs.hlp share/lincity/help/keyboard.hlp +share/lincity/help/loadgame.hlp share/lincity/help/market.hlp share/lincity/help/market2.hlp share/lincity/help/medium.hlp +share/lincity/help/menu.hlp share/lincity/help/mill.hlp share/lincity/help/mini-screen.hlp share/lincity/help/monument.hlp @@ -47,10 +51,12 @@ share/lincity/help/msb-pol.hlp share/lincity/help/msb-power.hlp share/lincity/help/msb-starve.hlp share/lincity/help/msb-ub40.hlp +share/lincity/help/newgame.hlp share/lincity/help/opening.hlp share/lincity/help/openload.hlp share/lincity/help/ore.hlp share/lincity/help/oremine.hlp +share/lincity/help/other-costs.hlp share/lincity/help/park.hlp share/lincity/help/pause.hlp share/lincity/help/pbar-coal.hlp @@ -62,6 +68,7 @@ share/lincity/help/pbar-ore.hlp share/lincity/help/pbar-pop.hlp share/lincity/help/pbar-steel.hlp share/lincity/help/pbar-tech.hlp +share/lincity/help/pbar.hlp share/lincity/help/pollution.hlp share/lincity/help/port.hlp share/lincity/help/pottery.hlp @@ -238,6 +245,7 @@ share/lincity/icons/med-offl.csi share/lincity/icons/med-offr.csi share/lincity/icons/med-onl.csi share/lincity/icons/med-onr.csi +share/lincity/icons/menu-button.csi share/lincity/icons/mill-button.csi share/lincity/icons/mill0.csi share/lincity/icons/mill1.csi @@ -275,7 +283,6 @@ share/lincity/icons/oremine1.csi share/lincity/icons/oremine2.csi share/lincity/icons/oremine3.csi share/lincity/icons/oremine4.csi -share/lincity/icons/oremine4.csi.old share/lincity/icons/oremine5.csi share/lincity/icons/oremine6.csi share/lincity/icons/oremine7.csi @@ -466,6 +473,7 @@ share/lincity/messages/blacksmithup.mes share/lincity/messages/coalmineup.mes share/lincity/messages/coalpowerup.mes share/lincity/messages/cricketup.mes +share/lincity/messages/didcoalsurvey.mes share/lincity/messages/error.mes share/lincity/messages/fire.mes share/lincity/messages/firestationup.mes @@ -510,6 +518,10 @@ share/lincity/opening/alt-8x8 share/lincity/opening/bad_times.scn share/lincity/opening/do_image share/lincity/opening/good_times.scn +share/lincity/opening/iso8859-1-8x8.fnt +share/lincity/opening/iso8859-1-8x8.raw +share/lincity/opening/iso8859-2-8x8.fnt +share/lincity/opening/iso8859-2-8x8.raw share/lincity/opening/open.pov share/lincity/opening/open.tga.gz share/lincity/opening/scrawl_s.fnt @@ -519,6 +531,8 @@ share/lincity/opening/text2 share/lincity/opening/text3 share/lincity/opening/winfont_16x16.fnt share/lincity/opening/winfont_8x8.fnt +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/lincity.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/lincity.mo @dirrm share/lincity/opening @dirrm share/lincity/messages @dirrm share/lincity/icons diff --git a/games/lincity/distinfo b/games/lincity/distinfo index f867a9b093a..b4e10b0d9cc 100644 --- a/games/lincity/distinfo +++ b/games/lincity/distinfo @@ -1,7 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/12/11 14:45:38 wiz Exp $ +$NetBSD: distinfo,v 1.5 2004/03/02 16:43:50 adam Exp $ -SHA1 (lincity-1.11.tar.gz) = b3b7fb00fffea90352fa5e5c6b7bf76d49cd493b -Size (lincity-1.11.tar.gz) = 475037 bytes -SHA1 (patch-aa) = 0f318f35627fc592a0f995e1cab99997c3ac79b8 -SHA1 (patch-ab) = 09860dec60aefe24c020aa3daf130512ec893d09 -SHA1 (patch-ac) = 79fc1cc4588a28d6aa0b0620754523a09ff0a019 +SHA1 (lincity-1.12.0.tar.gz) = 3fb4ca7923098598f3405b1908b34ed4f2dbc3b3 +Size (lincity-1.12.0.tar.gz) = 772216 bytes diff --git a/games/lincity/patches/patch-aa b/games/lincity/patches/patch-aa deleted file mode 100644 index d3fda5e7c8f..00000000000 --- a/games/lincity/patches/patch-aa +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:12 jlam Exp $ - ---- Makefile.orig Thu Feb 25 23:17:38 1999 -+++ Makefile Sat Aug 12 00:38:42 2000 -@@ -1,19 +1,19 @@ - # Makefile for LinCity (c) I J Peters 1995,1996. - - # This is where the binaries for LinCity will be placed. --LC_BINDIR = /usr/local/bin -+LC_BINDIR = ${PREFIX}/bin - # for solaris you might choose... - # LC_BINDIR = /opt/lcity/bin - - # This is where the library/data files will be placed. --LC_LIBDIR = /usr/local/lib/lincity -+LC_LIBDIR = ${PREFIX}/share/lincity - # for solaris you might choose... - # LC_LIBDIR = /opt/lcity/lib - - # export LC_LIBDIR - - # This is where the manpage will be placed. --LC_MANDIR = /usr/local/man/man6 -+LC_MANDIR = ${PREFIX}/man/man6 - LC_MANSUF = 6 - # for solaris you might choose... - # LC_LIBDIR = /opt/lcity/man/man6 -@@ -32,8 +32,8 @@ - # PROFL = -lc - # PROFD = -DCS_PROFILE - --LC_XFLAGS = $(CFLAGS) -DLC_X11 --LC_XLIBS = -lXExExt -lXext -lX11 -+LC_XFLAGS = $(CFLAGS) -I${BUILDLINK_X11_DIR}/include -DLC_X11 -+LC_XLIBS = ${LDFLAGS} -lXExExt -lXext -lX11 - - XOBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o xengine.o\ - xtransport.o xmarket.o xhelp.o lcx11.o -@@ -42,7 +42,7 @@ - - # /usr/X11R6/lib/X11/config/ is where Imake.tmpl lives, change the following - # line if yours is somewhere else. --LC_IMAKE_ARGS = -DUseInstalled -I/usr/X11R6/lib/X11/config -+LC_IMAKE_ARGS = -DUseInstalled -I${X11BASE}/lib/X11/config - - dummy: - @echo -@@ -117,33 +117,32 @@ - @echo - @echo xlincity compiled, now make install. - --install : -+install-lincity : - # a version(?) of mkdir for SCO OpenServer fails if the dir already - # exists, even with the -p flag, hence the '-'. We should still - # catch a failure with the chmod hopefully. - -mkdir -p $(LC_BINDIR) -- chmod 755 $(LC_BINDIR) - -cp lincity $(LC_BINDIR) - -chmod +s $(LC_BINDIR)/lincity -+ -+install-xlincity: -+ -mkdir -p $(LC_BINDIR) - -cp xlincity $(LC_BINDIR) - -chmod 755 $(LC_BINDIR)/xlincity -+ -+install-lib: - -mkdir -p $(LC_LIBDIR) -- chmod 755 $(LC_LIBDIR) -- cp -r icons $(LC_LIBDIR) -- chmod 755 $(LC_LIBDIR)/icons -- cp -r help $(LC_LIBDIR) -- chmod 755 $(LC_LIBDIR)/help -- cp -r messages $(LC_LIBDIR) -- chmod 755 $(LC_LIBDIR)/messages -- cp -r opening $(LC_LIBDIR) -- chmod 755 $(LC_LIBDIR)/opening -+ cp -R icons $(LC_LIBDIR) -+ cp -R help $(LC_LIBDIR) -+ cp -R messages $(LC_LIBDIR) -+ cp -R opening $(LC_LIBDIR) - cp colour.pal $(LC_LIBDIR) - chmod -R o+r $(LC_LIBDIR) -+ -+install-man: - -mkdir -p $(LC_MANDIR) - cp lincity.man $(LC_MANDIR)/lincity.$(LC_MANSUF) - chmod o+r $(LC_MANDIR)/lincity.$(LC_MANSUF) -- chmod o+rx `dirname $(LC_BINDIR)` -- chmod o+rx `dirname $(LC_MANDIR)` - - uninstall: - -rm $(LC_BINDIR)/lincity diff --git a/games/lincity/patches/patch-ab b/games/lincity/patches/patch-ab deleted file mode 100644 index e09956fba10..00000000000 --- a/games/lincity/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2000/08/12 06:30:50 jlam Exp $ - ---- main.cxx.orig Thu Feb 25 20:17:54 1999 -+++ main.cxx Sat Aug 12 00:48:39 2000 -@@ -779,7 +779,6 @@ - DIR *dp; - if ((dp = opendir (dir)) == NULL) - { -- closedir (dp); - return 0; - } - closedir (dp); diff --git a/games/lincity/patches/patch-ac b/games/lincity/patches/patch-ac deleted file mode 100644 index 847eb40c766..00000000000 --- a/games/lincity/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/12/11 14:45:39 wiz Exp $ - ---- lcx11.cxx.orig Fri Feb 26 02:17:54 1999 -+++ lcx11.cxx -@@ -715,7 +715,7 @@ - #ifdef USE_IMAGES - Fgl_putbox_low (display.win, 0, 0, - x1, y1, x2 - x1, y2 - y1, -- pixmap, (640 + BORDERX), -+ (unsigned char *)pixmap, (640 + BORDERX), - x1, y1); - #else - int x, y; -@@ -1115,7 +1115,9 @@ - init_icon_pixmap (int type) - { - unsigned char *g; -+#ifndef USE_IMAGES - int x, y; -+#endif - #ifdef ALLOW_PIX_DOUBLING - if (pix_double) - icon_pixmap[type] = XCreatePixmap (display.dpy, display.win -- cgit v1.2.3