[Midnightbsd-cvs] mports [18975] trunk/games/lincity: fix lincity build

[laffer1 at midnightbsd.org]

Revision: 18975
          http://svnweb.midnightbsd.org/mports/?rev=18975
Author:   laffer1
Date:     2015-05-15 19:00:11 -0400 (Fri, 15 May 2015)
Log Message:
-----------
fix lincity build

Modified Paths:
--------------
    trunk/games/lincity/Makefile
    trunk/games/lincity/pkg-plist

Added Paths:
-----------
    trunk/games/lincity/files/
    trunk/games/lincity/files/patch-pixmap.c
    trunk/games/lincity/files/patch-pixmap.h

Modified: trunk/games/lincity/Makefile
===================================================================
--- trunk/games/lincity/Makefile	2015-05-15 22:58:20 UTC (rev 18974)
+++ trunk/games/lincity/Makefile	2015-05-15 23:00:11 UTC (rev 18975)
@@ -1,57 +1,45 @@
-# New ports collection makefile for:    lincity
-# Date created:         13 Feb 1997
-# Whom:                 Julian Assange
-#
 # $MidnightBSD$
 # $FreeBSD: ports/games/lincity/Makefile,v 1.24 2007/05/19 20:06:46 flz Exp $
-#
 
 PORTNAME=	lincity
 PORTVERSION=	1.13.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Lincity%20Development%20Source/${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Rich city simulation game for X
+
 LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	SVGALIB NLS
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
-
-.if ${CC} == "clang"
-USE_CSTD=	c89
-.endif
-
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN6=		lincity.6
+OPTIONS_DEFINE=	NLS SVGALIB
+OPTIONS_SUB=	yes
 
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
+
+SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_CONFIGURE_ON=	--without-x
+SVGALIB_CONFIGURE_OFF=	--without-svga
+
 .include <bsd.mport.options.mk>
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/readpng.c
-
 .if ${PORT_OPTIONS:MSVGALIB}
-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB=	PROG="bin/lincity"
+PLIST_SUB+=	PROG="bin/lincity"
 .else
 USE_XORG=	sm xext
-CONFIGURE_ARGS+=	--without-svga
-PLIST_SUB=	PROG="bin/xlincity"
+PLIST_SUB+=	PROG="bin/xlincity"
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+pre-configure:
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/readpng.c
 
 .include <bsd.port.mk>

Added: trunk/games/lincity/files/patch-pixmap.c
===================================================================
--- trunk/games/lincity/files/patch-pixmap.c	                        (rev 0)
+++ trunk/games/lincity/files/patch-pixmap.c	2015-05-15 23:00:11 UTC (rev 18975)
@@ -0,0 +1,11 @@
+--- pixmap.c.orig	2003-03-17 01:32:40.000000000 +0300
++++ pixmap.c	2013-08-28 22:15:03.677227606 +0400
+@@ -390,7 +390,7 @@
+ 		  likes it in the file.  Still need to fix this in autoconf,
+                   but for now this will do. */
+ #if !defined (WIN32)
+-inline int 
++int 
+ pixmap_index (int x, int y)
+ {
+     return y*pixmap_width + x;


Property changes on: trunk/games/lincity/files/patch-pixmap.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/games/lincity/files/patch-pixmap.h
===================================================================
--- trunk/games/lincity/files/patch-pixmap.h	                        (rev 0)
+++ trunk/games/lincity/files/patch-pixmap.h	2015-05-15 23:00:11 UTC (rev 18975)
@@ -0,0 +1,11 @@
+--- pixmap.h.orig	2003-02-03 06:52:18.000000000 +0300
++++ pixmap.h	2013-08-28 22:14:20.285227378 +0400
+@@ -19,7 +19,7 @@
+ void initialize_pixmap (void);
+ void resize_pixmap (int new_width, int new_height);
+ int pixmap_getpixel (int x, int y);
+-inline int pixmap_index (int x, int y);
++int pixmap_index (int x, int y);
+ int pixmap_getpixel (int x, int y);
+ void pixmap_setpixel (int x, int y, int col);
+ void pixmap_hline (int x1, int y1, int x2, int col);


Property changes on: trunk/games/lincity/files/patch-pixmap.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/games/lincity/pkg-plist
===================================================================
--- trunk/games/lincity/pkg-plist	2015-05-15 22:58:20 UTC (rev 18974)
+++ trunk/games/lincity/pkg-plist	2015-05-15 23:00:11 UTC (rev 18975)
@@ -1,4 +1,5 @@
 %%PROG%%
+man/man6/lincity.6.gz
 %%DATADIR%%/colour.pal
 %%DATADIR%%/help/ask-dir.hlp
 %%DATADIR%%/help/blacksmith.hlp
@@ -532,8 +533,3 @@
 %%DATADIR%%/opening/winfont_8x8.fnt
 %%NLS%%share/locale/ca/LC_MESSAGES/lincity.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lincity.mo
- at dirrm %%DATADIR%%/opening
- at dirrm %%DATADIR%%/messages
- at dirrm %%DATADIR%%/icons
- at dirrm %%DATADIR%%/help
- at dirrm %%DATADIR%%