- Update to version 1.12.0

PR:		60464
Submitted by:	Ports Fury
This commit is contained in:
Kirill Ponomarev 2003-12-21 17:44:51 +00:00
parent 30480c3a02
commit b6f16b3151
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=96327
13 changed files with 38 additions and 220 deletions

View file

@ -6,18 +6,32 @@
#
PORTNAME= lincity
PORTVERSION= 1.11
PORTREVISION= 1
PORTVERSION= 1.12.0
CATEGORIES= games
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/linux/games/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rich city simulation game for X
BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_XLIB= yes
ALL_TARGET= freebsd
MAN6= lincity.6
.if defined(WITH_SVGALIB)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
CONFIGURE_ARGS+= --without-x
PLIST_SUB= PROG="bin/lincity"
.else
USE_XLIB= yes
CONFIGURE_ARGS+= --without-svga
PLIST_SUB= PROG="bin/xlincity"
.endif
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (lincity-1.11.tar.gz) = fa64ddfe0a6ca95a614843ac2fcd2473
MD5 (lincity-1.12.0.tar.gz) = 98daeef749d3ec17208193b6a1dc6b03

View file

@ -1,108 +0,0 @@
--- Makefile.orig Fri Feb 26 13:17:38 1999
+++ Makefile Tue Sep 12 02:50:50 2000
@@ -1,39 +1,39 @@
# 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
+# 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 +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
@@ -91,7 +91,7 @@
# 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 +122,19 @@
# 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)
uninstall:
-rm $(LC_BINDIR)/lincity

View file

@ -1,19 +0,0 @@
--- lcx11.cxx.orig Fri Feb 26 02:17:54 1999
+++ lcx11.cxx Tue Nov 19 05:35:40 2002
@@ -3,6 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <math.h>
#ifdef IRIX
@@ -715,7 +716,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;

View file

@ -1,18 +0,0 @@
--- main.cxx.orig Fri Feb 26 02:17:54 1999
+++ main.cxx Tue Nov 19 05:27:27 2002
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#if !defined (WIN32)
#include <strings.h>
#endif
@@ -779,7 +780,6 @@
DIR *dp;
if ((dp = opendir (dir)) == NULL)
{
- closedir (dp);
return 0;
}
closedir (dp);

View file

@ -1,15 +0,0 @@
--- Imakefile.orig Sat Feb 13 23:55:02 1999
+++ Imakefile Tue Nov 19 05:52:36 2002
@@ -9,10 +9,11 @@
LOCAL_LIBRARIES = $(XLIB)
DEPLIBS = $(DEPXLIB)
SYS_LIBRARIES = -lm
+ CC = $(CXX)
SRCS = main.cxx mouse.cxx screen.cxx mps.cxx typeinit.cxx\
engine.cxx transport.cxx market.cxx help.cxx lcx11.cxx
OBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o\
xengine.o xtransport.o xmarket.o xhelp.o lcx11.o
-ComplexProgramTarget(xlincity)
+ComplexProgramTargetNoMan(xlincity)

View file

@ -1,10 +0,0 @@
--- help.cxx.orig Tue Nov 19 05:32:53 2002
+++ help.cxx Tue Nov 19 05:33:02 2002
@@ -3,6 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#if !defined (WIN32)
#include <strings.h>
#endif

View file

@ -1,10 +0,0 @@
--- mouse.cxx.orig Tue Nov 19 05:28:01 2002
+++ mouse.cxx Tue Nov 19 05:28:35 2002
@@ -2,6 +2,7 @@
// Copyright (c) I J Peters 1995,1996. Please read the file 'COPYRIGHT'.
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#if !defined (WIN32)
#include <strings.h>

View file

@ -1,10 +0,0 @@
--- mps.cxx.orig Tue Nov 19 05:30:41 2002
+++ mps.cxx Tue Nov 19 05:30:56 2002
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
+#include <string.h>
#if !defined (WIN32)
#include <strings.h>
#include <unistd.h>

View file

@ -1,10 +0,0 @@
--- screen.cxx.orig Tue Nov 19 05:29:40 2002
+++ screen.cxx Tue Nov 19 05:29:50 2002
@@ -3,6 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <math.h>
#if !defined (WIN32)
#include <strings.h>

View file

@ -1,10 +0,0 @@
--- typeinit.cxx.orig Tue Nov 19 05:31:27 2002
+++ typeinit.cxx Tue Nov 19 05:31:36 2002
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#if !defined (WIN32)
#include <strings.h>
#endif

View file

@ -9,4 +9,4 @@ broke and build rockets to escape from a pollution ridden and resource
starved planet, it's up to you. Due to the finite resources available in any
one place, this is not a game that you can leave for long periods of time.
WWW: http://www.floot.demon.co.uk/lincity.html
WWW: http://lincity.sourceforge.net/

View file

@ -1,4 +1,4 @@
bin/xlincity
%%PROG%%
share/lincity/colour.pal
share/lincity/help/ask-dir.hlp
share/lincity/help/blacksmith.hlp
@ -19,18 +19,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
@ -44,10 +48,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
@ -59,6 +65,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
@ -235,6 +242,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
@ -272,7 +280,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
@ -463,6 +470,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
@ -507,6 +515,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
@ -516,6 +528,8 @@ 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
@dirrm share/lincity/opening
@dirrm share/lincity/messages
@dirrm share/lincity/icons