Date: Sat, 25 Sep 1999 18:28:56 -0400 (EDT) From: Mikhail Teterin <mi@aldan.algebra.com> To: FreeBSD-gnats-submit@freebsd.org Cc: proff@iq.org Subject: ports/13965: upgrading the lincity port Message-ID: <199909252228.SAA81547@rtfm.newton>
next in thread | raw e-mail | index | archive | help
>Number: 13965 >Category: ports >Synopsis: upgrading the lincity port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Sep 25 15:50:03 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Mikhail Teterin >Release: FreeBSD 3.3-RC i386 >Organization: Virtual Estates, Inc. >Environment: >Description: As many other ports, unfortunately, this one was ingoring the local settings for CC and CFLAGS. It was also requiring gmake needlessly (it seems). Finally, the newer version of the software is available -- 1.11. Two ouright bugs had to be fixed in the software, besides the usual configuration patches. >How-To-Repeat: >Fix: diff -r -u -N lincity/Makefile lincity-1.11/Makefile --- lincity/Makefile Wed Aug 25 02:03:57 1999 +++ lincity-1.11/Makefile Sat Sep 25 18:24:40 1999 @@ -6,16 +6,13 @@ # $FreeBSD: ports/games/lincity/Makefile,v 1.5 1999/08/25 06:03:57 obrien Exp $ # -DISTNAME= lincity109 -PKGNAME= lincity-1.09 +DISTNAME= lincity-1.11 CATEGORIES= games MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/linux/games/ -EXTRACT_SUFX= -src.tar.gz MAINTAINER= proff@iq.org USE_XLIB= yes -USE_GMAKE= yes ALL_TARGET= freebsd MAN6= lincity.6 MANCOMPRESSED= no diff -r -u -N lincity/files/md5 lincity-1.11/files/md5 --- lincity/files/md5 Wed Oct 29 19:48:48 1997 +++ lincity-1.11/files/md5 Sat Sep 25 18:25:54 1999 @@ -1 +1 @@ -MD5 (lincity109-src.tar.gz) = 8a114a31569c4def6c4a2670adb96a64 +MD5 (lincity-1.11.tar.gz) = fa64ddfe0a6ca95a614843ac2fcd2473 Binary files lincity/lincity-1.11.tgz and lincity-1.11/lincity-1.11.tgz differ diff -r -u -N lincity/patches/patch-aa lincity-1.11/patches/patch-aa --- lincity/patches/patch-aa Tue Oct 28 22:20:51 1997 +++ lincity-1.11/patches/patch-aa Sat Sep 25 17:37:59 1999 @@ -1,7 +1,7 @@ -*** Makefile.WAS Tue Oct 28 16:40:56 1997 ---- Makefile Tue Oct 28 16:40:59 1997 +*** Makefile.orig Thu Feb 25 23:17:38 1999 +--- Makefile Sat Sep 25 17:37:29 1999 *************** -*** 1,19 **** +*** 1,32 **** # Makefile for LinCity (c) I J Peters 1995,1996. # This is where the binaries for LinCity will be placed. @@ -21,7 +21,20 @@ LC_MANSUF = 6 # for solaris you might choose... # LC_LIBDIR = /opt/lcity/man/man6 ---- 1,19 ---- + + + # CC = egcs +! CC = gcc + +! # 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)\" + # -fno-strength-reduce + # PROFF = -pg + # PROFL = -lc +--- 1,32 ---- # Makefile for LinCity (c) I J Peters 1995,1996. # This is where the binaries for LinCity will be placed. @@ -41,20 +54,16 @@ LC_MANSUF = 6 # for solaris you might choose... # LC_LIBDIR = /opt/lcity/man/man6 -*************** -*** 23,29 **** - 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)\" - # -fno-strength-reduce - # PROFF = -pg - # PROFL = -lc ---- 23,29 ---- - EXTRA_OPTS = -fstrength-reduce -ffast-math + + + # CC = egcs +! # CC = gcc + +! 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)\" -I${X11BASE}/include +! CFLAGS += $(EXTRA_OPTS) -DLIBDIR=\"$(LC_LIBDIR)\" -I${X11BASE}/include # -fno-strength-reduce # PROFF = -pg # PROFL = -lc diff -r -u -N lincity/patches/patch-ab lincity-1.11/patches/patch-ab --- lincity/patches/patch-ab Wed Dec 31 19:00:00 1969 +++ lincity-1.11/patches/patch-ab Sat Sep 25 17:47:55 1999 @@ -0,0 +1,11 @@ +--- lcx11.cxx.orig Thu Feb 25 20:17:54 1999 ++++ lcx11.cxx Sat Sep 25 17:47:12 1999 +@@ -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; diff -r -u -N lincity/patches/patch-ac lincity-1.11/patches/patch-ac --- lincity/patches/patch-ac Wed Dec 31 19:00:00 1969 +++ lincity-1.11/patches/patch-ac Sat Sep 25 17:57:17 1999 @@ -0,0 +1,8 @@ +--- main.cxx.orig Thu Feb 25 20:17:54 1999 ++++ main.cxx Sat Sep 25 17:56:44 1999 +@@ -780,5 +780,4 @@ + if ((dp = opendir (dir)) == NULL) + { +- closedir (dp); + return 0; + } diff -r -u -N lincity/pkg/PLIST lincity-1.11/pkg/PLIST --- lincity/pkg/PLIST Wed Aug 12 22:23:07 1998 +++ lincity-1.11/pkg/PLIST Sat Sep 25 17:50:54 1999 @@ -368,6 +368,7 @@ lib/lincity/icons/tover2-off.csi lib/lincity/icons/tover2-on.csi lib/lincity/icons/green.csi +lib/lincity/help/ask-dir.hlp lib/lincity/help/msb-power.hlp lib/lincity/help/index.hlp lib/lincity/help/pause.hlp @@ -503,6 +504,8 @@ lib/lincity/opening/bad_times.scn lib/lincity/opening/text2 lib/lincity/opening/alt-8x8 +lib/lincity/opening/winfont_16x16.fnt +lib/lincity/opening/winfont_8x8.fnt lib/lincity/opening/text1 lib/lincity/opening/do_image lib/lincity/opening/8x8thin >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199909252228.SAA81547>