Attachment #127473 for bug #171317

Lines 5-44 Link Here

(-)./Makefile (-20 / +52 lines)
5	# $FreeBSD: ports/games/BillardGL/Makefile,v 1.13 2012/08/04 22:52:02 kwm Exp $	5	# $FreeBSD: ports/games/BillardGL/Makefile,v 1.13 2012/08/04 22:52:02 kwm Exp $
6	#	6	#
7		7
8	PORTNAME= BillardGL	8	PORTNAME= BillardGL
9	PORTVERSION= 1.75	9	PORTVERSION= 1.75
10	PORTREVISION= 7	10	PORTREVISION= 8
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}	12	MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}/ \
		13	SF/nemysisfreebsdp/:icons
		14	DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
		15	${PORTNAME}-LP-010.zip \
		16	${PORTNAME}_icons.tar.gz:icons
		17	DIST_SUBDIR= ${PORTNAME:L}
13		18
14	MAINTAINER= ports@FreeBSD.org	19	MAINTAINER= nemysis@gmx.ch
15	COMMENT= OpenGL billiards simulator	20	COMMENT= OpenGL pool billiard simulation
		21
		22	LICENSE= GPLv2
		23
		24	EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
16		25
17	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src	26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
18		27
19	USE_GMAKE= yes	28	USE_GMAKE= yes
		29	USE_DOS2UNIX= yes
20	USE_XORG= xmu xext x11 xi	30	USE_XORG= xmu xext x11 xi
21	USE_GL= gl glut	31	USE_GL= glut
		32
		33	PLIST_FILES= bin/${PORTNAME} \
		34	share/pixmaps/${PORTNAME}_48.png \
		35	share/pixmaps/${PORTNAME}_64.png \
		36	share/pixmaps/${PORTNAME}_72.png \
		37	share/pixmaps/${PORTNAME}_96.png
		38
		39	PORTDATA= *
		40	PORTDOCS= README
		41
		42	OPTIONS_DEFINE= LANG
		43	LANG_DESC= Install additional Language
		44	OPTIONS_DEFAULT= LANG
		45
		46	.include <bsd.port.options.mk>
22		47
23	post-patch:	48	post-patch:
24	@${REINPLACE_CMD} -e 's\|%%PORTNAME%%\|${PORTNAME}\|; \	49	# Fix data location
25	s\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/Namen.h	50	@${REINPLACE_CMD} -e 's\|/usr/share/BillardGL/\|${DATADIR}/\|' ${WRKSRC}/Namen.h
26		51
27	do-install:	52	do-install:
		53	# Executable
28	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin	54	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
29		55
30	@${MKDIR} ${DATADIR}	56	# Data
31	@${MKDIR} ${DATADIR}/lang	57	# ${MKDIR} ${DATADIR}
32	${INSTALL_DATA} ${WRKSRC}/lang/*.lang ${DATADIR}/lang	58	.for d in Texturen lang
33	@${MKDIR} ${DATADIR}/Texturen	59	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
34	.for i in 1 2 4 8
35	@${MKDIR} ${DATADIR}/Texturen/${i}
36	${INSTALL_DATA} ${WRKSRC}/Texturen/${i}/*.bmp ${DATADIR}/Texturen/${i}
37	.endfor	60	.endfor
38		61
39	.ifndef (NOPORTDOCS)	62	# Pixmaps
40	@${MKDIR} ${DOCSDIR}	63	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png ${PREFIX}/share/pixmaps
41	${TR} -d '\r' <${WRKSRC}/README >${DOCSDIR}/README	64
		65	# Documentation
		66	.if ${PORT_OPTIONS:MDOCS}
		67	${MKDIR} ${DOCSDIR}
		68	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
		69	.endif
		70
		71	# Additional Language
		72	.if ${PORT_OPTIONS:MLANG}
		73	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-LP-010/*.lang ${DATADIR}/lang/
42	.endif	74	.endif
43		75
44	.include <bsd.port.mk>	76	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +6 lines)
1	SHA256 (BillardGL-1.75.tar.gz) = 9b865b1254aa30125480ec7ea2ce00d91524db066a524b78492545782856df96	1	SHA256 (billardgl/BillardGL-1.75.tar.gz) = 9b865b1254aa30125480ec7ea2ce00d91524db066a524b78492545782856df96
2	SIZE (BillardGL-1.75.tar.gz) = 736295	2	SIZE (billardgl/BillardGL-1.75.tar.gz) = 736295
		3	SHA256 (billardgl/BillardGL-LP-010.zip) = a1325a0ed9b0dc3e2cbf8acebe4f7c4caf4183547b777b7543ad61e1e6e07cf6
		4	SIZE (billardgl/BillardGL-LP-010.zip) = 232940
		5	SHA256 (billardgl/BillardGL_icons.tar.gz) = f4d5812c32f57f81e610962b68941d79ff4469f25ed21bc0ff5a50b1c3c5b446
		6	SIZE (billardgl/BillardGL_icons.tar.gz) = 25088




--- Makefile.orig	2012-09-03 23:55:03.000000000 +0200
+++ Makefile	2012-09-03 23:57:30.000000000 +0200
@@ -5,14 +5,14 @@
 
 ####### Compiler, tools and options
 
-CC	=	gcc
-CXX	=	g++
-CFLAGS	=	-pipe -Wall -W -DNO_DEBUG -g
-CXXFLAGS=	-pipe -Wall -W -DNO_DEBUG -g 
-INCPATH	=	-I/usr/X11R6/include 
-LINK	=	g++
+CC	?=	gcc
+CXX	?=	g++
+CFLAGS	?=	-pipe -Wall -W -DNO_DEBUG -g
+CXXFLAGS?=	-pipe -Wall -W -DNO_DEBUG -g 
+INCPATH	=	-I${LOCALBASE}/include
+LINK	=	${CXX}
 LFLAGS	=	
-LIBS	=	-L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
+LIBS	=	-L${LOCALBASE}/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
 
 ## -lqgl -lGLU
 

Lines 1-11 Link Here

(-)./files/patch-Namen.h (-11 lines)
1	--- Namen.h.orig Sat Jan 3 16:33:42 2004
2	+++ Namen.h Sat Jan 3 16:34:03 2004
3	@@ -23,7 +23,7 @@
4	#define TUTORIAL 105
5
6	#ifndef _WIN32
7	-#define PFAD "/usr/share/BillardGL/"
8	+#define PFAD "%%LOCALBASE%%/share/%%PORTNAME%%/"
9	#endif
10
11	#ifndef PFAD




bin/BillardGL
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%DATADIR%%/lang/900.lang
%%DATADIR%%/lang/901.lang
%%DATADIR%%/lang/904.lang
%%DATADIR%%/lang/999.lang
@dirrm %%DATADIR%%/lang
%%DATADIR%%/Texturen/1/1.bmp
%%DATADIR%%/Texturen/1/10.bmp
%%DATADIR%%/Texturen/1/11.bmp
%%DATADIR%%/Texturen/1/12.bmp
%%DATADIR%%/Texturen/1/13.bmp
%%DATADIR%%/Texturen/1/14.bmp
%%DATADIR%%/Texturen/1/15.bmp
%%DATADIR%%/Texturen/1/2.bmp
%%DATADIR%%/Texturen/1/3.bmp
%%DATADIR%%/Texturen/1/4.bmp
%%DATADIR%%/Texturen/1/5.bmp
%%DATADIR%%/Texturen/1/6.bmp
%%DATADIR%%/Texturen/1/7.bmp
%%DATADIR%%/Texturen/1/8.bmp
%%DATADIR%%/Texturen/1/9.bmp
%%DATADIR%%/Texturen/1/a00.bmp
%%DATADIR%%/Texturen/1/a1.bmp
%%DATADIR%%/Texturen/1/a10.bmp
%%DATADIR%%/Texturen/1/a11.bmp
%%DATADIR%%/Texturen/1/a12.bmp
%%DATADIR%%/Texturen/1/a13.bmp
%%DATADIR%%/Texturen/1/a14.bmp
%%DATADIR%%/Texturen/1/a15.bmp
%%DATADIR%%/Texturen/1/a2.bmp
%%DATADIR%%/Texturen/1/a3.bmp
%%DATADIR%%/Texturen/1/a4.bmp
%%DATADIR%%/Texturen/1/a5.bmp
%%DATADIR%%/Texturen/1/a6.bmp
%%DATADIR%%/Texturen/1/a7.bmp
%%DATADIR%%/Texturen/1/a8.bmp
%%DATADIR%%/Texturen/1/a9.bmp
%%DATADIR%%/Texturen/1/aalpha.bmp
%%DATADIR%%/Texturen/1/aalpha2.bmp
%%DATADIR%%/Texturen/1/buchstaben.bmp
%%DATADIR%%/Texturen/1/buchstabenalpha.bmp
%%DATADIR%%/Texturen/1/dreizehn.bmp
%%DATADIR%%/Texturen/1/filzkachel.bmp
%%DATADIR%%/Texturen/1/halbe.bmp
%%DATADIR%%/Texturen/1/holz.bmp
%%DATADIR%%/Texturen/1/logo.bmp
%%DATADIR%%/Texturen/1/volle.bmp
@dirrm %%DATADIR%%/Texturen/1
%%DATADIR%%/Texturen/2/1.bmp
%%DATADIR%%/Texturen/2/10.bmp
%%DATADIR%%/Texturen/2/11.bmp
%%DATADIR%%/Texturen/2/12.bmp
%%DATADIR%%/Texturen/2/13.bmp
%%DATADIR%%/Texturen/2/14.bmp
%%DATADIR%%/Texturen/2/15.bmp
%%DATADIR%%/Texturen/2/2.bmp
%%DATADIR%%/Texturen/2/3.bmp
%%DATADIR%%/Texturen/2/4.bmp
%%DATADIR%%/Texturen/2/5.bmp
%%DATADIR%%/Texturen/2/6.bmp
%%DATADIR%%/Texturen/2/7.bmp
%%DATADIR%%/Texturen/2/8.bmp
%%DATADIR%%/Texturen/2/9.bmp
%%DATADIR%%/Texturen/2/aalpha2.bmp
%%DATADIR%%/Texturen/2/buchstaben.bmp
%%DATADIR%%/Texturen/2/buchstabenalpha.bmp
%%DATADIR%%/Texturen/2/filzkachel.bmp
%%DATADIR%%/Texturen/2/halbe.bmp
%%DATADIR%%/Texturen/2/holz.bmp
%%DATADIR%%/Texturen/2/volle.bmp
@dirrm %%DATADIR%%/Texturen/2
%%DATADIR%%/Texturen/4/1.bmp
%%DATADIR%%/Texturen/4/10.bmp
%%DATADIR%%/Texturen/4/11.bmp
%%DATADIR%%/Texturen/4/12.bmp
%%DATADIR%%/Texturen/4/13.bmp
%%DATADIR%%/Texturen/4/14.bmp
%%DATADIR%%/Texturen/4/15.bmp
%%DATADIR%%/Texturen/4/2.bmp
%%DATADIR%%/Texturen/4/3.bmp
%%DATADIR%%/Texturen/4/4.bmp
%%DATADIR%%/Texturen/4/5.bmp
%%DATADIR%%/Texturen/4/6.bmp
%%DATADIR%%/Texturen/4/7.bmp
%%DATADIR%%/Texturen/4/8.bmp
%%DATADIR%%/Texturen/4/9.bmp
%%DATADIR%%/Texturen/4/holz.bmp
@dirrm %%DATADIR%%/Texturen/4
%%DATADIR%%/Texturen/8/1.bmp
%%DATADIR%%/Texturen/8/10.bmp
%%DATADIR%%/Texturen/8/11.bmp
%%DATADIR%%/Texturen/8/12.bmp
%%DATADIR%%/Texturen/8/13.bmp
%%DATADIR%%/Texturen/8/14.bmp
%%DATADIR%%/Texturen/8/15.bmp
%%DATADIR%%/Texturen/8/2.bmp
%%DATADIR%%/Texturen/8/3.bmp
%%DATADIR%%/Texturen/8/4.bmp
%%DATADIR%%/Texturen/8/5.bmp
%%DATADIR%%/Texturen/8/6.bmp
%%DATADIR%%/Texturen/8/7.bmp
%%DATADIR%%/Texturen/8/8.bmp
%%DATADIR%%/Texturen/8/9.bmp
%%DATADIR%%/Texturen/8/holz.bmp
@dirrm %%DATADIR%%/Texturen/8
@dirrm %%DATADIR%%/Texturen
@dirrm %%DATADIR%%

Return to bug 171317

Lines 1-24 Link Here

(-)./files/patch-Makefile (-23 / +23 lines)
1	--- Makefile.orig Sat Jan 3 16:30:14 2004	1	--- Makefile.orig 2012-09-03 23:55:03.000000000 +0200
2	+++ Makefile Sat Jan 3 16:32:08 2004	2	+++ Makefile 2012-09-03 23:57:30.000000000 +0200
3	@@ -5,14 +5,14 @@	3	@@ -5,14 +5,14 @@
4		4
5	####### Compiler, tools and options	5	####### Compiler, tools and options
6		6
7	-CC = gcc	7	-CC = gcc
8	-CXX = g++	8	-CXX = g++
9	-CFLAGS = -pipe -Wall -W -DNO_DEBUG -g	9	-CFLAGS = -pipe -Wall -W -DNO_DEBUG -g
10	-CXXFLAGS= -pipe -Wall -W -DNO_DEBUG -g	10	-CXXFLAGS= -pipe -Wall -W -DNO_DEBUG -g
11	-INCPATH = -I/usr/X11R6/include	11	-INCPATH = -I/usr/X11R6/include
12	-LINK = g++	12	-LINK = g++
13	+CC ?= gcc	13	+CC ?= gcc
14	+CXX ?= g++	14	+CXX ?= g++
15	+CFLAGS += -pipe -Wall -W -DNO_DEBUG -g	15	+CFLAGS ?= -pipe -Wall -W -DNO_DEBUG -g
16	+CXXFLAGS+= -pipe -Wall -W -DNO_DEBUG -g	16	+CXXFLAGS?= -pipe -Wall -W -DNO_DEBUG -g
17	+INCPATH = -I${LOCALBASE}/include	17	+INCPATH = -I${LOCALBASE}/include
18	+LINK = ${CXX}	18	+LINK = ${CXX}
19	LFLAGS =	19	LFLAGS =
20	-LIBS = -L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi	20	-LIBS = -L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
21	+LIBS = -L${LOCALBASE}/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi	21	+LIBS = -L${LOCALBASE}/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
22		22
23	## -lqgl -lGLU	23	## -lqgl -lGLU
24		24

Lines 1-109 Link Here

(-)./pkg-plist (-109 lines)
1	bin/BillardGL
2	%%PORTDOCS%%%%DOCSDIR%%/README
3	%%PORTDOCS%%@dirrm %%DOCSDIR%%
4	%%DATADIR%%/lang/900.lang
5	%%DATADIR%%/lang/901.lang
6	%%DATADIR%%/lang/904.lang
7	%%DATADIR%%/lang/999.lang
8	@dirrm %%DATADIR%%/lang
9	%%DATADIR%%/Texturen/1/1.bmp
10	%%DATADIR%%/Texturen/1/10.bmp
11	%%DATADIR%%/Texturen/1/11.bmp
12	%%DATADIR%%/Texturen/1/12.bmp
13	%%DATADIR%%/Texturen/1/13.bmp
14	%%DATADIR%%/Texturen/1/14.bmp
15	%%DATADIR%%/Texturen/1/15.bmp
16	%%DATADIR%%/Texturen/1/2.bmp
17	%%DATADIR%%/Texturen/1/3.bmp
18	%%DATADIR%%/Texturen/1/4.bmp
19	%%DATADIR%%/Texturen/1/5.bmp
20	%%DATADIR%%/Texturen/1/6.bmp
21	%%DATADIR%%/Texturen/1/7.bmp
22	%%DATADIR%%/Texturen/1/8.bmp
23	%%DATADIR%%/Texturen/1/9.bmp
24	%%DATADIR%%/Texturen/1/a00.bmp
25	%%DATADIR%%/Texturen/1/a1.bmp
26	%%DATADIR%%/Texturen/1/a10.bmp
27	%%DATADIR%%/Texturen/1/a11.bmp
28	%%DATADIR%%/Texturen/1/a12.bmp
29	%%DATADIR%%/Texturen/1/a13.bmp
30	%%DATADIR%%/Texturen/1/a14.bmp
31	%%DATADIR%%/Texturen/1/a15.bmp
32	%%DATADIR%%/Texturen/1/a2.bmp
33	%%DATADIR%%/Texturen/1/a3.bmp
34	%%DATADIR%%/Texturen/1/a4.bmp
35	%%DATADIR%%/Texturen/1/a5.bmp
36	%%DATADIR%%/Texturen/1/a6.bmp
37	%%DATADIR%%/Texturen/1/a7.bmp
38	%%DATADIR%%/Texturen/1/a8.bmp
39	%%DATADIR%%/Texturen/1/a9.bmp
40	%%DATADIR%%/Texturen/1/aalpha.bmp
41	%%DATADIR%%/Texturen/1/aalpha2.bmp
42	%%DATADIR%%/Texturen/1/buchstaben.bmp
43	%%DATADIR%%/Texturen/1/buchstabenalpha.bmp
44	%%DATADIR%%/Texturen/1/dreizehn.bmp
45	%%DATADIR%%/Texturen/1/filzkachel.bmp
46	%%DATADIR%%/Texturen/1/halbe.bmp
47	%%DATADIR%%/Texturen/1/holz.bmp
48	%%DATADIR%%/Texturen/1/logo.bmp
49	%%DATADIR%%/Texturen/1/volle.bmp
50	@dirrm %%DATADIR%%/Texturen/1
51	%%DATADIR%%/Texturen/2/1.bmp
52	%%DATADIR%%/Texturen/2/10.bmp
53	%%DATADIR%%/Texturen/2/11.bmp
54	%%DATADIR%%/Texturen/2/12.bmp
55	%%DATADIR%%/Texturen/2/13.bmp
56	%%DATADIR%%/Texturen/2/14.bmp
57	%%DATADIR%%/Texturen/2/15.bmp
58	%%DATADIR%%/Texturen/2/2.bmp
59	%%DATADIR%%/Texturen/2/3.bmp
60	%%DATADIR%%/Texturen/2/4.bmp
61	%%DATADIR%%/Texturen/2/5.bmp
62	%%DATADIR%%/Texturen/2/6.bmp
63	%%DATADIR%%/Texturen/2/7.bmp
64	%%DATADIR%%/Texturen/2/8.bmp
65	%%DATADIR%%/Texturen/2/9.bmp
66	%%DATADIR%%/Texturen/2/aalpha2.bmp
67	%%DATADIR%%/Texturen/2/buchstaben.bmp
68	%%DATADIR%%/Texturen/2/buchstabenalpha.bmp
69	%%DATADIR%%/Texturen/2/filzkachel.bmp
70	%%DATADIR%%/Texturen/2/halbe.bmp
71	%%DATADIR%%/Texturen/2/holz.bmp
72	%%DATADIR%%/Texturen/2/volle.bmp
73	@dirrm %%DATADIR%%/Texturen/2
74	%%DATADIR%%/Texturen/4/1.bmp
75	%%DATADIR%%/Texturen/4/10.bmp
76	%%DATADIR%%/Texturen/4/11.bmp
77	%%DATADIR%%/Texturen/4/12.bmp
78	%%DATADIR%%/Texturen/4/13.bmp
79	%%DATADIR%%/Texturen/4/14.bmp
80	%%DATADIR%%/Texturen/4/15.bmp
81	%%DATADIR%%/Texturen/4/2.bmp
82	%%DATADIR%%/Texturen/4/3.bmp
83	%%DATADIR%%/Texturen/4/4.bmp
84	%%DATADIR%%/Texturen/4/5.bmp
85	%%DATADIR%%/Texturen/4/6.bmp
86	%%DATADIR%%/Texturen/4/7.bmp
87	%%DATADIR%%/Texturen/4/8.bmp
88	%%DATADIR%%/Texturen/4/9.bmp
89	%%DATADIR%%/Texturen/4/holz.bmp
90	@dirrm %%DATADIR%%/Texturen/4
91	%%DATADIR%%/Texturen/8/1.bmp
92	%%DATADIR%%/Texturen/8/10.bmp
93	%%DATADIR%%/Texturen/8/11.bmp
94	%%DATADIR%%/Texturen/8/12.bmp
95	%%DATADIR%%/Texturen/8/13.bmp
96	%%DATADIR%%/Texturen/8/14.bmp
97	%%DATADIR%%/Texturen/8/15.bmp
98	%%DATADIR%%/Texturen/8/2.bmp
99	%%DATADIR%%/Texturen/8/3.bmp
100	%%DATADIR%%/Texturen/8/4.bmp
101	%%DATADIR%%/Texturen/8/5.bmp
102	%%DATADIR%%/Texturen/8/6.bmp
103	%%DATADIR%%/Texturen/8/7.bmp
104	%%DATADIR%%/Texturen/8/8.bmp
105	%%DATADIR%%/Texturen/8/9.bmp
106	%%DATADIR%%/Texturen/8/holz.bmp
107	@dirrm %%DATADIR%%/Texturen/8
108	@dirrm %%DATADIR%%/Texturen
109	@dirrm %%DATADIR%%