From root@edwinm.ik.nu  Tue Sep 17 10:11:12 2013
Return-Path: <root@edwinm.ik.nu>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 7F5CFDED
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Sep 2013 10:11:12 +0000 (UTC)
	(envelope-from root@edwinm.ik.nu)
Received: from home.mons.net (blinky.xs4all.nl [83.160.118.125])
	by mx1.freebsd.org (Postfix) with ESMTP id 195CA2AED
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Sep 2013 10:11:11 +0000 (UTC)
Received: by freebsd10.edwinm.ik.nu (Postfix, from userid 0)
	id 754502E1D0; Tue, 17 Sep 2013 12:02:30 +0200 (CEST)
Message-Id: <20130917100230.754502E1D0@freebsd10.edwinm.ik.nu>
Date: Tue, 17 Sep 2013 12:02:30 +0200 (CEST)
From: Edwin Mons <ports@edwinm.ik.nu>
Reply-To: Edwin Mons <ports@edwinm.ik.nu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer][patch] Upgrade port games/xtrojka to 1.2.3
X-Send-Pr-Version: 3.114
X-GNATS-Notify: e@ik.nu

>Number:         182184
>Category:       ports
>Synopsis:       [maintainer][patch] Upgrade port games/xtrojka to 1.2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    bdrewery
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 17 10:20:00 UTC 2013
>Closed-Date:    Thu Nov 07 06:45:57 CST 2013
>Last-Modified:  Thu Nov  7 12:50:00 UTC 2013
>Originator:     Edwin Mons
>Release:        FreeBSD 10.0-ALPHA1 i386
>Organization:
>Environment:
System: FreeBSD freebsd10 10.0-ALPHA1 FreeBSD 10.0-ALPHA1 #0 r255503: Fri Sep 13 03:56:49 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386


>Description:
	Update port games/xtrojka to version 1.2.3.

	This also makes the port buildable with clang, as desirable for 
	FreeBSD 10.0.
>How-To-Repeat:
	
>Fix:


--- xtrojka.patch begins here ---
diff -ruN xtrojka.orig/Makefile xtrojka/Makefile
--- xtrojka.orig/Makefile	2012-11-17 06:57:58.000000000 +0100
+++ xtrojka/Makefile	2013-09-17 10:33:53.000000000 +0200
@@ -1,22 +1,18 @@
-# New ports collection makefile for:	xtrojka
-# Date created:				22 march 2000
-# Whom:					Edwin Mons
-#
-# $FreeBSD: ports/games/xtrojka/Makefile,v 1.8 2012/11/17 05:57:58 svnexp Exp $
-#
+# $FreeBSD$
 
 PORTNAME=	xtrojka
-PORTVERSION=	1.1
-PORTREVISION=	3
+PORTVERSION=	1.2.3
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	games/arcade/tetris
+DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//g}
 
-MAINTAINER=	e@ik.nu
+MAINTAINER=	ports@edwinm.ik.nu
 COMMENT=	Game of skill similar to T*tris
 
-USE_XORG=	x11 xt xproto xaw
-WRKSRC=		${WRKDIR}
+USE_XORG=	x11 xt xproto xaw xmu xext
+MAKE_JOBS_UNSAFE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}
 MAN6=		xtrojka.6
 MANCOMPRESSED=	yes
 
diff -ruN xtrojka.orig/distinfo xtrojka/distinfo
--- xtrojka.orig/distinfo	2011-07-03 16:25:33.000000000 +0200
+++ xtrojka/distinfo	2013-09-17 10:29:03.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (xtrojka.tar.gz) = a94d3b2b1920a4b542ac6e4bc9f39de855a81991304015267975da1753550e93
-SIZE (xtrojka.tar.gz) = 27021
+SHA256 (xtrojka123.tar.gz) = dae9cb2094914060f00d6cb15842cd7ecd71a78347bf12b2e7539e9ba8d89932
+SIZE (xtrojka123.tar.gz) = 49446
diff -ruN xtrojka.orig/files/old-patch-Makefile xtrojka/files/old-patch-Makefile
--- xtrojka.orig/files/old-patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ xtrojka/files/old-patch-Makefile	2013-09-17 10:28:57.000000000 +0200
@@ -0,0 +1,83 @@
+--- Makefile.orig	Sat Oct 21 22:38:22 1995
++++ Makefile	Wed Jul 12 08:50:34 2000
+@@ -8,7 +8,7 @@
+ 
+ #	your favorite C-compiler
+ #
+-CC=gcc
++CC?=gcc
+ #CC=cc
+ 
+ 
+@@ -22,13 +22,13 @@
+ #	Touch 'hiscore.c' and 'score_status_mgr.c' when you change
+ #	these variables!
+ #
+-HSFILE=/usr/local/games/lib/xtrojka.scores
++HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
+ #HSFILE=/tmp/xtrojka.scores
+ CFLAGS= -DSCOREFILE='"$(HSFILE)"' 
+ 
+ # add library search path
+ #
+-CFLAGS+=-L/usr/X11/lib
++CFLAGS+=-L${LOCALBASE}/lib
+ 
+ # on some systems you might add this line, because gcc starts wining
+ # about 'sizeof(Display)', since Display might be an empty struct;
+@@ -42,24 +42,28 @@
+ 
+ #	location of xtrojka game
+ #
+-TARGET_DIR=/usr/games
++TARGET_DIR=${PREFIX}/bin
+ 
+ 
+ #	location of the manualpage
+ #
+-MANDIR=/usr/local/man/man6
++MANDIR=${PREFIX}/man/man6
+ 
+ 
+ #	please comment out for the system you use
+ #
+ #	sunos 4.1.3
+-XDIR=/usr/openwin/include
+-LIBS=-lm
++#XDIR=/usr/openwin/include
++#LIBS=-lm
+ 
+ # solaris
+ #XDIR=/usr/openwin/include
+ #LIBS=-lnsl
+ 
++# FreeBSD
++XDIR=${LOCALBASE}/include
++LIBS=-lm
++
+ #
+ #
+ #	main
+@@ -101,11 +105,17 @@
+ #
+ #
+ install:
+-	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
+-	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" manpage > xtrojka.6; \
+-	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
+-	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
+-	touch $(HSFILE); chmod go+rwx $(HSFILE);
++	@rm -f hsn
++	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
++	sed -e "s/__SCOREDIR__/`cat hsn`/g" manpage > xtrojka.6
++	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
++	cp xtrojka $(TARGET_DIR)
++	chmod 2755 $(TARGET_DIR)/xtrojka
++	chgrp games $(TARGET_DIR)/xtrojka
++	touch $(HSFILE)
++	chmod 664 $(HSFILE)
++	chgrp games $(HSFILE)
++	@rm -f hsn
+ 	
+ clean:
+ 	rm -rf *.o core xtrojka xtrojka.6 
diff -ruN xtrojka.orig/files/patch-Makefile xtrojka/files/patch-Makefile
--- xtrojka.orig/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ xtrojka/files/patch-Makefile	2013-09-17 10:28:56.000000000 +0200
@@ -0,0 +1,78 @@
+--- Makefile.orig	1996-07-27 20:05:03.000000000 +0200
++++ Makefile	2013-09-12 11:55:14.000000000 +0200
+@@ -10,15 +10,15 @@
+ #					xtrojka version (do not change!)
+ VERSION=123
+ #					where to put the binary
+-TARGET_DIR=/usr/games
++TARGET_DIR=${PREFIX}/bin
+ #					where to put the manpage
+-MANDIR=/usr/local/man/man6
++MANDIR=${PREFIX}/man/man6
+ #					the location of the highscorefile
+-HSFILE=/fill_in_your_scorefile
++HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
+ #					your favourite packer
+ COMPRESS=gzip -v9
+ #					your favourite c-compiler
+-CC=gcc
++CC?=gcc
+ #					used X libraries
+ XLIBS= -lXaw -lXmu -lXt -lX11 -lXext
+ #					some more X libraries
+@@ -48,7 +48,7 @@
+ #	comment out your favorite system (the one you use, that is...)
+ #
+ #					search the libaries here
+-LIBPATH=-L/usr/X11/lib
++LIBPATH=-L${LOCALBASE}/lib
+ #					doesn't work too well on all systems
+ #LCK=-DLOCKING
+ #					add debug info
+@@ -75,7 +75,13 @@
+ #
+ # Linux
+ #
+-SYS=-DLINUX
++#SYS=-DLINUX
++
++#
++# FreeBSD
++#
++XDIR=-I${LOCALBASE}/include
++LIBS=-lm
+ 
+ #
+ #
+@@ -105,11 +111,17 @@
+ 	rm -rf xtrojka$(VERSION);
+ 
+ install:
+-	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
+-	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" xtrojka.man > xtrojka.6; \
+-	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
+-	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
+-	touch $(HSFILE); chmod go+rwx $(HSFILE);
++	@rm -f hsn
++	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
++	sed -e "s/__SCOREDIR__/`cat hsn`/g" xtrojka.man > xtrojka.6
++	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
++	cp xtrojka $(TARGET_DIR)
++	chmod 2755 $(TARGET_DIR)/xtrojka
++	chgrp games $(TARGET_DIR)/xtrojka
++	touch $(HSFILE)
++	chmod 664 $(HSFILE)
++	chgrp games $(HSFILE)
++	@rm -f hsn
+ 	
+ clean:
+ 	rm -rf tags *.o core xtrojka xtrojka.6 
+@@ -119,7 +131,7 @@
+ #	DEPENDENCIES
+ #
+ 
+-_strdefs.h _resdefs.h:	XTrojka 
++_strdefs.h _resdefs.h:	XTrojka.uk
+ 	$(RESGEN)
+ 
+ actions.o: actions.c actions.h xtrojka.h debug.h
diff -ruN xtrojka.orig/files/patch-aa xtrojka/files/patch-aa
--- xtrojka.orig/files/patch-aa	2008-04-19 19:49:50.000000000 +0200
+++ xtrojka/files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
---- Makefile.orig	Sat Oct 21 22:38:22 1995
-+++ Makefile	Wed Jul 12 08:50:34 2000
-@@ -8,7 +8,7 @@
- 
- #	your favorite C-compiler
- #
--CC=gcc
-+CC?=gcc
- #CC=cc
- 
- 
-@@ -22,13 +22,13 @@
- #	Touch 'hiscore.c' and 'score_status_mgr.c' when you change
- #	these variables!
- #
--HSFILE=/usr/local/games/lib/xtrojka.scores
-+HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
- #HSFILE=/tmp/xtrojka.scores
- CFLAGS= -DSCOREFILE='"$(HSFILE)"' 
- 
- # add library search path
- #
--CFLAGS+=-L/usr/X11/lib
-+CFLAGS+=-L${LOCALBASE}/lib
- 
- # on some systems you might add this line, because gcc starts wining
- # about 'sizeof(Display)', since Display might be an empty struct;
-@@ -42,24 +42,28 @@
- 
- #	location of xtrojka game
- #
--TARGET_DIR=/usr/games
-+TARGET_DIR=${PREFIX}/bin
- 
- 
- #	location of the manualpage
- #
--MANDIR=/usr/local/man/man6
-+MANDIR=${PREFIX}/man/man6
- 
- 
- #	please comment out for the system you use
- #
- #	sunos 4.1.3
--XDIR=/usr/openwin/include
--LIBS=-lm
-+#XDIR=/usr/openwin/include
-+#LIBS=-lm
- 
- # solaris
- #XDIR=/usr/openwin/include
- #LIBS=-lnsl
- 
-+# FreeBSD
-+XDIR=${LOCALBASE}/include
-+LIBS=-lm
-+
- #
- #
- #	main
-@@ -101,11 +105,17 @@
- #
- #
- install:
--	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
--	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" manpage > xtrojka.6; \
--	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
--	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
--	touch $(HSFILE); chmod go+rwx $(HSFILE);
-+	@rm -f hsn
-+	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
-+	sed -e "s/__SCOREDIR__/`cat hsn`/g" manpage > xtrojka.6
-+	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
-+	cp xtrojka $(TARGET_DIR)
-+	chmod 2755 $(TARGET_DIR)/xtrojka
-+	chgrp games $(TARGET_DIR)/xtrojka
-+	touch $(HSFILE)
-+	chmod 664 $(HSFILE)
-+	chgrp games $(HSFILE)
-+	@rm -f hsn
- 	
- clean:
- 	rm -rf *.o core xtrojka xtrojka.6 
diff -ruN xtrojka.orig/files/patch-resgen xtrojka/files/patch-resgen
--- xtrojka.orig/files/patch-resgen	1970-01-01 01:00:00.000000000 +0100
+++ xtrojka/files/patch-resgen	2013-09-17 10:28:57.000000000 +0200
@@ -0,0 +1,12 @@
+--- resgen.orig	2013-09-12 11:56:10.000000000 +0200
++++ resgen	2013-09-12 11:56:20.000000000 +0200
+@@ -16,7 +16,8 @@
+ #	These files will be included
+ #	in the source code as a fall-back resource.
+ #
+-INPUT=XTrojka
++set -x
++INPUT=XTrojka.uk
+ RESFILE=_resdefs.h
+ HFILE=_strdefs.h
+ H="/* hoi */"
diff -ruN xtrojka.orig/pkg-plist xtrojka/pkg-plist
--- xtrojka.orig/pkg-plist	2000-05-29 07:49:38.000000000 +0200
+++ xtrojka/pkg-plist	2013-09-17 10:29:03.000000000 +0200
@@ -1,3 +1,4 @@
 bin/xtrojka
 share/xtrojka/xtrojka.scores
+man/man6/xtrojka.6.gz
 @dirrm share/xtrojka
--- xtrojka.patch ends here ---


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Tue Sep 17 10:20:09 UTC 2013 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182184 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Sep 17 10:20:11 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182184 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: e@ik.nu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/182184: [maintainer][patch] Upgrade port games/xtrojka to 1.2.3
Date: Tue, 17 Sep 2013 10:20:10 UT

 Maintainer of games/xtrojka,
 
 Please note that PR ports/182184 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182184
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Edwin Mons <e@ik.nu>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182184: [maintainer][patch] Upgrade port games/xtrojka
 to 1.2.3
Date: Tue, 17 Sep 2013 12:21:09 +0200

 On 17-09-13 12:20, Edwin Groothuis wrote:
 > Maintainer of games/xtrojka,
 >
 > Please note that PR ports/182184 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182184
 >
 
 I agree, as I was the one submitting it.
 
 Cheers,
 Edwin
 

From: Edwin Mons <e@ik.nu>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182184: [maintainer][patch] Upgrade port games/xtrojka
 to 1.2.3
Date: Thu, 17 Oct 2013 14:12:39 +0100

 On 17-09-13 11:20, Edwin Groothuis wrote:
 > Maintainer of games/xtrojka,
 >
 > Please note that PR ports/182184 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 
 I approve the patch (last mail might've been worded in an ambiguous way)
 
 Edwin
 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Fri Oct 18 03:02:44 UTC 2013 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182184 
Responsible-Changed-From-To: freebsd-ports-bugs->bdrewery 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Thu Nov 7 05:18:36 CST 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182184 
State-Changed-From-To: open->closed 
State-Changed-By: bdrewery 
State-Changed-When: Thu Nov 7 06:45:56 CST 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182184 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182184: commit references a PR
Date: Thu,  7 Nov 2013 12:46:02 +0000 (UTC)

 Author: bdrewery
 Date: Thu Nov  7 12:45:47 2013
 New Revision: 333085
 URL: http://svnweb.freebsd.org/changeset/ports/333085
 
 Log:
   - Update to 1.2.3
   - Support staging
   - Fix build on 10
   
   PR:		ports/182184
   Submitted by:	Edwin Mons <ports@edwinm.ik.nu> (maintainer)
 
 Added:
   head/games/xtrojka/files/old-patch-Makefile   (contents, props changed)
   head/games/xtrojka/files/patch-Makefile   (contents, props changed)
   head/games/xtrojka/files/patch-resgen   (contents, props changed)
 Deleted:
   head/games/xtrojka/files/patch-aa
 Modified:
   head/games/xtrojka/Makefile
   head/games/xtrojka/distinfo
   head/games/xtrojka/pkg-plist
 
 Modified: head/games/xtrojka/Makefile
 ==============================================================================
 --- head/games/xtrojka/Makefile	Thu Nov  7 12:33:09 2013	(r333084)
 +++ head/games/xtrojka/Makefile	Thu Nov  7 12:45:47 2013	(r333085)
 @@ -1,26 +1,24 @@
 -# Created by: Edwin Mons
  # $FreeBSD$
  
  PORTNAME=	xtrojka
 -PORTVERSION=	1.1
 -PORTREVISION=	3
 +PORTVERSION=	1.2.3
  CATEGORIES=	games
 -MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/
 -DISTNAME=	${PORTNAME}
 +MASTER_SITES=	${MASTER_SITE_SUNSITE}
 +MASTER_SITE_SUBDIR=	games/arcade/tetris
 +DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//g}
  
 -MAINTAINER=	e@ik.nu
 +MAINTAINER=	ports@edwinm.ik.nu
  COMMENT=	Game of skill similar to T*tris
  
 -USE_XORG=	x11 xt xproto xaw
 -WRKSRC=		${WRKDIR}
 -MAN6=		xtrojka.6
 -MANCOMPRESSED=	yes
 +USE_XORG=	x11 xt xproto xaw xmu xext
 +MAKE_JOBS_UNSAFE=	yes
 +WRKSRC=		${WRKDIR}/${DISTNAME}
 +MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
  
 -NO_STAGE=	yes
  pre-install:
 -	${MKDIR} ${PREFIX}/share/xtrojka
 +	${MKDIR} ${STAGEDIR}${PREFIX}/share/xtrojka
  
  post-install:
 -	${STRIP_CMD} ${PREFIX}/bin/xtrojka
 +	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xtrojka
  
  .include <bsd.port.mk>
 
 Modified: head/games/xtrojka/distinfo
 ==============================================================================
 --- head/games/xtrojka/distinfo	Thu Nov  7 12:33:09 2013	(r333084)
 +++ head/games/xtrojka/distinfo	Thu Nov  7 12:45:47 2013	(r333085)
 @@ -1,2 +1,2 @@
 -SHA256 (xtrojka.tar.gz) = a94d3b2b1920a4b542ac6e4bc9f39de855a81991304015267975da1753550e93
 -SIZE (xtrojka.tar.gz) = 27021
 +SHA256 (xtrojka123.tar.gz) = dae9cb2094914060f00d6cb15842cd7ecd71a78347bf12b2e7539e9ba8d89932
 +SIZE (xtrojka123.tar.gz) = 49446
 
 Added: head/games/xtrojka/files/old-patch-Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/xtrojka/files/old-patch-Makefile	Thu Nov  7 12:45:47 2013	(r333085)
 @@ -0,0 +1,83 @@
 +--- Makefile.orig	Sat Oct 21 22:38:22 1995
 ++++ Makefile	Wed Jul 12 08:50:34 2000
 +@@ -8,7 +8,7 @@
 + 
 + #	your favorite C-compiler
 + #
 +-CC=gcc
 ++CC?=gcc
 + #CC=cc
 + 
 + 
 +@@ -22,13 +22,13 @@
 + #	Touch 'hiscore.c' and 'score_status_mgr.c' when you change
 + #	these variables!
 + #
 +-HSFILE=/usr/local/games/lib/xtrojka.scores
 ++HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
 + #HSFILE=/tmp/xtrojka.scores
 + CFLAGS= -DSCOREFILE='"$(HSFILE)"' 
 + 
 + # add library search path
 + #
 +-CFLAGS+=-L/usr/X11/lib
 ++CFLAGS+=-L${LOCALBASE}/lib
 + 
 + # on some systems you might add this line, because gcc starts wining
 + # about 'sizeof(Display)', since Display might be an empty struct;
 +@@ -42,24 +42,28 @@
 + 
 + #	location of xtrojka game
 + #
 +-TARGET_DIR=/usr/games
 ++TARGET_DIR=${PREFIX}/bin
 + 
 + 
 + #	location of the manualpage
 + #
 +-MANDIR=/usr/local/man/man6
 ++MANDIR=${PREFIX}/man/man6
 + 
 + 
 + #	please comment out for the system you use
 + #
 + #	sunos 4.1.3
 +-XDIR=/usr/openwin/include
 +-LIBS=-lm
 ++#XDIR=/usr/openwin/include
 ++#LIBS=-lm
 + 
 + # solaris
 + #XDIR=/usr/openwin/include
 + #LIBS=-lnsl
 + 
 ++# FreeBSD
 ++XDIR=${LOCALBASE}/include
 ++LIBS=-lm
 ++
 + #
 + #
 + #	main
 +@@ -101,11 +105,17 @@
 + #
 + #
 + install:
 +-	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
 +-	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" manpage > xtrojka.6; \
 +-	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
 +-	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
 +-	touch $(HSFILE); chmod go+rwx $(HSFILE);
 ++	@rm -f hsn
 ++	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
 ++	sed -e "s/__SCOREDIR__/`cat hsn`/g" manpage > xtrojka.6
 ++	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
 ++	cp xtrojka $(TARGET_DIR)
 ++	chmod 2755 $(TARGET_DIR)/xtrojka
 ++	chgrp games $(TARGET_DIR)/xtrojka
 ++	touch $(HSFILE)
 ++	chmod 664 $(HSFILE)
 ++	chgrp games $(HSFILE)
 ++	@rm -f hsn
 + 	
 + clean:
 + 	rm -rf *.o core xtrojka xtrojka.6 
 
 Added: head/games/xtrojka/files/patch-Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/xtrojka/files/patch-Makefile	Thu Nov  7 12:45:47 2013	(r333085)
 @@ -0,0 +1,78 @@
 +--- Makefile.orig	1996-07-27 20:05:03.000000000 +0200
 ++++ Makefile	2013-09-12 11:55:14.000000000 +0200
 +@@ -10,15 +10,15 @@
 + #					xtrojka version (do not change!)
 + VERSION=123
 + #					where to put the binary
 +-TARGET_DIR=/usr/games
 ++TARGET_DIR=${PREFIX}/bin
 + #					where to put the manpage
 +-MANDIR=/usr/local/man/man6
 ++MANDIR=${PREFIX}/man/man6
 + #					the location of the highscorefile
 +-HSFILE=/fill_in_your_scorefile
 ++HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
 + #					your favourite packer
 + COMPRESS=gzip -v9
 + #					your favourite c-compiler
 +-CC=gcc
 ++CC?=gcc
 + #					used X libraries
 + XLIBS= -lXaw -lXmu -lXt -lX11 -lXext
 + #					some more X libraries
 +@@ -48,7 +48,7 @@
 + #	comment out your favorite system (the one you use, that is...)
 + #
 + #					search the libaries here
 +-LIBPATH=-L/usr/X11/lib
 ++LIBPATH=-L${LOCALBASE}/lib
 + #					doesn't work too well on all systems
 + #LCK=-DLOCKING
 + #					add debug info
 +@@ -75,7 +75,13 @@
 + #
 + # Linux
 + #
 +-SYS=-DLINUX
 ++#SYS=-DLINUX
 ++
 ++#
 ++# FreeBSD
 ++#
 ++XDIR=-I${LOCALBASE}/include
 ++LIBS=-lm
 + 
 + #
 + #
 +@@ -105,11 +111,17 @@
 + 	rm -rf xtrojka$(VERSION);
 + 
 + install:
 +-	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
 +-	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" xtrojka.man > xtrojka.6; \
 +-	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
 +-	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
 +-	touch $(HSFILE); chmod go+rwx $(HSFILE);
 ++	@rm -f hsn
 ++	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
 ++	sed -e "s/__SCOREDIR__/`cat hsn`/g" xtrojka.man > xtrojka.6
 ++	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
 ++	cp xtrojka $(TARGET_DIR)
 ++	chmod 2755 $(TARGET_DIR)/xtrojka
 ++	chgrp games $(TARGET_DIR)/xtrojka
 ++	touch $(HSFILE)
 ++	chmod 664 $(HSFILE)
 ++	chgrp games $(HSFILE)
 ++	@rm -f hsn
 + 	
 + clean:
 + 	rm -rf tags *.o core xtrojka xtrojka.6 
 +@@ -119,7 +131,7 @@
 + #	DEPENDENCIES
 + #
 + 
 +-_strdefs.h _resdefs.h:	XTrojka 
 ++_strdefs.h _resdefs.h:	XTrojka.uk
 + 	$(RESGEN)
 + 
 + actions.o: actions.c actions.h xtrojka.h debug.h
 
 Added: head/games/xtrojka/files/patch-resgen
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/xtrojka/files/patch-resgen	Thu Nov  7 12:45:47 2013	(r333085)
 @@ -0,0 +1,12 @@
 +--- resgen.orig	2013-09-12 11:56:10.000000000 +0200
 ++++ resgen	2013-09-12 11:56:20.000000000 +0200
 +@@ -16,7 +16,8 @@
 + #	These files will be included
 + #	in the source code as a fall-back resource.
 + #
 +-INPUT=XTrojka
 ++set -x
 ++INPUT=XTrojka.uk
 + RESFILE=_resdefs.h
 + HFILE=_strdefs.h
 + H="/* hoi */"
 
 Modified: head/games/xtrojka/pkg-plist
 ==============================================================================
 --- head/games/xtrojka/pkg-plist	Thu Nov  7 12:33:09 2013	(r333084)
 +++ head/games/xtrojka/pkg-plist	Thu Nov  7 12:45:47 2013	(r333085)
 @@ -1,3 +1,4 @@
  bin/xtrojka
  share/xtrojka/xtrojka.scores
 +man/man6/xtrojka.6.gz
  @dirrm share/xtrojka
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
