Hello, This updates lincity to the latest (and probably the last) version. - switch from imake to autocrap+make - update license marker - some patches were merged upstream - remove maintainer - no such mail anymore Tested on amd64 and macppc. OK?
Index: Makefile =================================================================== RCS file: /cvs/ports/games/lincity/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile 22 Jan 2015 21:17:46 -0000 1.16 +++ Makefile 2 Sep 2015 10:20:21 -0000 @@ -2,26 +2,22 @@ COMMENT= Rich city simulation game for X -DISTNAME= lincity-1.11 -REVISION = 2 +DISTNAME= lincity-1.12.1 CATEGORIES= games HOMEPAGE= http://lincity.sourceforge.net/ -MAINTAINER= Wilbern Cobb <wc...@openbsd.org> - -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= X11 Xau Xdmcp Xext c m pthread-stubs stdc++ xcb - -MASTER_SITES= http://www.linklevel.net/distfiles/ +WANTLIB= ICE SM X11 Xext c m -BUILD_DEPENDS= devel/imake +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lincity/} -MAKE_FLAGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" -ALL_TARGET= xlincity -NO_TEST= Yes +MODULES= devel/gettext +CONFIGURE_STYLE= gnu +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" post-extract: - @cd ${WRKSRC}; ln -s lincity.man xlincity.man + @cd ${WRKSRC}; ln -s lincity.6 xlincity.6 .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/games/lincity/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 17 May 2013 09:12:26 -0000 1.4 +++ distinfo 2 Sep 2015 10:20:21 -0000 @@ -1,2 +1,2 @@ -SHA256 (lincity-1.11.tar.gz) = xdOyUtV+KMZebs1//eesT/1C4lN0vD4BMxbnoF9MpyM= -SIZE (lincity-1.11.tar.gz) = 475037 +SHA256 (lincity-1.12.1.tar.gz) = kiOnJCBOB1XtZdauICpbGodiBMyDWrPocjDcOfe5uXY= +SIZE (lincity-1.12.1.tar.gz) = 795709 Index: patches/patch-Imakefile =================================================================== RCS file: patches/patch-Imakefile diff -N patches/patch-Imakefile --- patches/patch-Imakefile 28 Sep 2002 21:25:05 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -$OpenBSD: patch-Imakefile,v 1.2 2002/09/28 21:25:05 naddy Exp $ ---- Imakefile.orig Sat Feb 13 23:55:02 1999 -+++ Imakefile Sat Sep 28 23:23:22 2002 -@@ -15,4 +15,4 @@ LOCAL_LIBRARIES = $(XLIB) - OBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o\ - xengine.o xtransport.o xmarket.o xhelp.o lcx11.o - --ComplexProgramTarget(xlincity) -+ComplexCplusplusProgramTarget(xlincity) Index: patches/patch-Makefile =================================================================== RCS file: patches/patch-Makefile diff -N patches/patch-Makefile --- patches/patch-Makefile 23 Sep 2012 08:07:54 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,110 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.2 2012/09/23 08:07:54 matthieu Exp $ ---- Makefile.orig Fri Feb 26 05:17:38 1999 -+++ Makefile Sun Jul 29 01:56:46 2001 -@@ -1,39 +1,40 @@ - # 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 - - - # CC = egcs --CC = gcc -+CC = $(CXX) - - # EXTRA_OPTS = -fomit-frame-pointer -fstrength-reduce -ffast-math - # EXTRA_OPTS = -fstrength-reduce -ffast-math - WARN_OPTS = -Wall -Wpointer-arith -Wcast-align -Winline - # DEBUG_OPTS =-g --CFLAGS = -O2 $(DEBUG_OPTS) $(EXTRA_OPTS) $(WARN_OPTS) -DLIBDIR=\"$(LC_LIBDIR)\" -+CFLAGS = $(CXXFLAGS) $(DEBUG_OPTS) $(EXTRA_OPTS) $(WARN_OPTS) \ -+ -DLIBDIR=\"$(LC_LIBDIR)\" - # -fno-strength-reduce - # PROFF = -pg - # PROFL = -lc - # PROFD = -DCS_PROFILE - --LC_XFLAGS = $(CFLAGS) -DLC_X11 --LC_XLIBS = -lXExExt -lXext -lX11 -+LC_XFLAGS = $(CFLAGS) -DLC_X11 -I$(X11BASE)/include -+LC_XLIBS = -lXExExt -lXext -lX11 -L$(X11BASE)/lib - - XOBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o xengine.o\ - xtransport.o xmarket.o xhelp.o lcx11.o -@@ -42,7 +43,7 @@ XOBJS = xmain.o xmouse.o xscreen.o xmps. - - # /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$(LOCALBASE)/lib/X11/config - - dummy: - @echo -@@ -91,7 +92,7 @@ lincity : main.o mouse.o screen.o mps.o - # all the objects and libraries. - xlincity : $(XOBJS) - imake -s XMakefile $(LC_IMAKE_ARGS) LC_LIBDIR=$(LC_LIBDIR) -- make -f XMakefile -+ $(MAKE) -f XMakefile - - solaris : - make -f sunosMakefile LC_LIBDIR=$(LC_LIBDIR) -@@ -122,28 +123,20 @@ install : - # 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 -- -cp xlincity $(LC_BINDIR) -- -chmod 755 $(LC_BINDIR)/xlincity -+ $(BSD_INSTALL_PROGRAM) xlincity $(LC_BINDIR) - -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 colour.pal $(LC_LIBDIR) -- chmod -R o+r $(LC_LIBDIR) -+ $(BSD_INSTALL_DATA) colour.pal $(LC_LIBDIR) -+ -mkdir -p $(LC_LIBDIR)/icons -+ $(BSD_INSTALL_DATA) icons/* $(LC_LIBDIR)/icons -+ -mkdir -p $(LC_LIBDIR)/help -+ $(BSD_INSTALL_DATA) help/* $(LC_LIBDIR)/help -+ -mkdir -p $(LC_LIBDIR)/messages -+ $(BSD_INSTALL_DATA) messages/* $(LC_LIBDIR)/messages -+ -mkdir -p $(LC_LIBDIR)/opening -+ $(BSD_INSTALL_DATA) opening/* $(LC_LIBDIR)/opening - -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)` -+ $(BSD_INSTALL_MAN) lincity.man $(LC_MANDIR)/lincity.$(LC_MANSUF) -+ $(BSD_INSTALL_MAN) lincity.man $(LC_MANDIR)/xlincity.$(LC_MANSUF) - - uninstall: - -rm $(LC_BINDIR)/lincity Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 2 Sep 2015 10:20:21 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- Makefile.in.orig Wed Aug 26 16:49:56 2015 ++++ Makefile.in Wed Aug 26 16:50:23 2015 +@@ -186,10 +186,11 @@ EXTRA_DIST = $(LC_DISTDIRS) \ + CHANGES COPYRIGHT Acknowledgements \ + config.sh \ + README.profiling \ +- lincity.6 ++ lincity.6 \ ++ xlincity.6 + + +-man_MANS = lincity.6 ++man_MANS = lincity.6 xlincity.6 + nobase_pkgdata_DATA = help/* icons/* messages/* opening/* colour.pal + + Index: patches/patch-lcx11_cxx =================================================================== RCS file: patches/patch-lcx11_cxx diff -N patches/patch-lcx11_cxx --- patches/patch-lcx11_cxx 28 Sep 2002 21:25:05 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-lcx11_cxx,v 1.2 2002/09/28 21:25:05 naddy Exp $ ---- lcx11.cxx.orig Fri Feb 26 02:17:54 1999 -+++ lcx11.cxx Sat Sep 28 23:19:46 2002 -@@ -5,16 +5,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <math.h> --#ifdef IRIX --#include <strings.h> --#endif --// I'm told the following is needed. --#ifdef SUNOS --#include <string.h> --#endif --#ifdef SCO - #include <string.h> --#endif - - // this is for OS/2 - RVI - #ifdef __EMX__ -@@ -715,7 +706,7 @@ refresh_screen (int x1, int y1, int x2, - #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; Index: patches/patch-main_cxx =================================================================== RCS file: patches/patch-main_cxx diff -N patches/patch-main_cxx --- patches/patch-main_cxx 29 Jul 2001 00:07:36 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-main_cxx,v 1.1.1.1 2001/07/29 00:07:36 naddy Exp $ ---- main.cxx.orig Fri Feb 26 02:17:54 1999 -+++ main.cxx Sun Jul 29 01:56:46 2001 -@@ -779,7 +779,6 @@ directory_exists (char *dir) - DIR *dp; - if ((dp = opendir (dir)) == NULL) - { -- closedir (dp); - return 0; - } - closedir (dp); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/lincity/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 15 Sep 2004 00:46:09 -0000 1.2 +++ pkg/PLIST 2 Sep 2015 10:20:21 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:46:09 espie Exp $ -bin/xlincity +@bin bin/xlincity @man man/man6/lincity.6 @man man/man6/xlincity.6 share/lincity/ @@ -24,18 +24,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 @@ -49,10 +53,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 @@ -64,6 +70,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 @@ -241,6 +248,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 @@ -278,7 +286,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 @@ -470,6 +477,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 @@ -515,6 +523,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 @@ -524,3 +536,5 @@ share/lincity/opening/text2 share/lincity/opening/text3 share/lincity/opening/winfont_16x16.fnt share/lincity/opening/winfont_8x8.fnt +share/locale/ca/LC_MESSAGES/lincity.mo +share/locale/it/LC_MESSAGES/lincity.mo
