Attachment #139453 for bug #185695

View | Details | Raw Unified | Return to bug 185695
Collapse All | Expand All





OPTIONS_DEFINE=	SDL

BROKEN=		Does not build

USE_BZIP2=	yes
USES=		compiler gmake
USE_XORG=	x11
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CFLAGS+=	-Wno-deprecated-writable-strings
CONFIGURE_ARGS=	--enable-alternate-scoresdir=${SCOREDIR} \
		--enable-alternate-gameuser=root \
		--enable-alternate-gamegroup=games


PLIST_SUB=	SCOREDIR="${SCOREDIR}"

MAN6=		xconq.6
INFO=		xconq

DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" \


SCOREDIR?=	/var/games/xconq

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSDL}

CONFIGURE_ARGS+=--enable-default-ui=sdl
PLIST_SUB+=	NOSDL="@comment "
.else
USES+=		tk
USE_XORG+=	xext xmu xt xaw
USE_TK_BUILD=	yes
USE_TK=		yes
CONFIGURE_ARGS+=--with-tclconfig=${TCL_LIBDIR} \
		--with-tkconfig=${TK_LIBDIR}
PLIST_SUB+=	NOSDL=""
.endif

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == "clang"
CFLAGS+=	-Wno-deprecated-writable-strings
.else
CFLAGS+=	-Wno-write-strings
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		'/^HFLAGS/s| $${debugging}||' ${WRKSRC}/configure

	(cd ${WRKSRC}/doc && makeinfo xconq.texi)

post-install:
	(cd ${WRKSRC}/doc && ${INSTALL_DATA} xconq.info \
		${STAGEDIR}${PREFIX}/${INFO_PATH})
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xconq
.if empty(PORT_OPTIONS:MSDL)
.for i in imf2x imfapp x2imf
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
.endfor
.endif
	@${FIND} ${STAGEDIR}${DATADIR} -empty -delete

.include <bsd.port.post.mk>




--- Makefile.in.orig
+++ Makefile.in
@@ -274,20 +274,19 @@
 	fi
 
 MAKEDIRS= \
-	$(prefix) \
-	$(exec_prefix) \
-	$(bindir) \
-	$(datadir) \
-	$(gamelibdir) \
-	$(imagesdir) \
-	$(scoresdir) \
-	$(mandir) \
-	$(man6dir) \
-	$(infodir) \
-	$(tcltkdir) \
-	$(BWidgetdir) \
-	$(BWidgetimagesdir) \
-	$(BWidgetlangdir)
+	$(DESTDIR)$(prefix) \
+	$(DESTDIR)$(exec_prefix) \
+	$(DESTDIR)$(bindir) \
+	$(DESTDIR)$(datadir) \
+	$(DESTDIR)$(gamelibdir) \
+	$(DESTDIR)$(imagesdir) \
+	$(DESTDIR)$(mandir) \
+	$(DESTDIR)$(man6dir) \
+	$(DESTDIR)$(infodir) \
+	$(DESTDIR)$(tcltkdir) \
+	$(DESTDIR)$(BWidgetdir) \
+	$(DESTDIR)$(BWidgetimagesdir) \
+	$(DESTDIR)$(BWidgetlangdir)
 
 .PHONY: install-dirs
 install-dirs:
@@ -305,9 +304,6 @@
 			true ; \
 		fi ; \
 	done
-	chown $(GAMEUID) $(scoresdir)
-	chgrp $(GAMEGRP) $(scoresdir)
-	chmod $(DIRPERM) $(scoresdir)
 
 # Build a source distribution.
 DIST_VERSION=@XCONQ_VERSION_FULL@




--- curses/Makefile.in.orig
+++ curses/Makefile.in
@@ -132,11 +132,11 @@
 	else \
 		progname="$(CCONQ_EXEC_NAME)" ; \
 	fi; \
-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
-	chown $(GAMEUID) $(bindir)/$${progname}; \
-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
-	chmod $(GAMEPERM) $(bindir)/$${progname}; \
-	$(INSTALL_DATA) cconq.6 $(man6dir)
+	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
+	chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
+	chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
+	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname}; \
+	$(INSTALL_DATA) cconq.6 $(DESTDIR)$(man6dir)
 
 # Cleanliness support.
 

Line 0 Link Here

(-)games/xconq/files/patch-doc__Makefile.in (+11 lines)
	1	--- doc/Makefile.in.orig
	2	+++ doc/Makefile.in
	3	@@ -95,7 +95,7 @@
	4
	5	install-info: info
	6	for i in .info ; do \
	7	- $(INSTALL_DATA) $$i $(infodir)/$$i ; \
	8	+ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
	9	done
	10
	11	# Generation of DVI files.




--- images/Makefile.in.orig
+++ images/Makefile.in
@@ -51,16 +51,16 @@
 install-only:
 	for i in `ls $(srcdir)/*.gif `; do \
 		echo $$i; \
-		$(INSTALL_DATA) $(srcdir)/$$i $(imagesdir); \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(imagesdir); \
 	done
 	for i in `ls $(srcdir)/*.bmp `; do \
 		echo $$i; \
-		$(INSTALL_DATA) $(srcdir)/$$i $(imagesdir); \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(imagesdir); \
 	done
-	chown $(GAMEUID) $(imagesdir) $(imagesdir)/*
-	chgrp $(GAMEGRP) $(imagesdir) $(imagesdir)/*
-	chmod $(DIRPERM) $(imagesdir)
-	chmod $(FILEPERM) $(imagesdir)/*
+	chown $(GAMEUID) $(DESTDIR)$(imagesdir) $(DESTDIR)$(imagesdir)/*
+	chgrp $(GAMEGRP) $(DESTDIR)$(imagesdir) $(DESTDIR)$(imagesdir)/*
+	chmod $(DIRPERM) $(DESTDIR)$(imagesdir)
+	chmod $(FILEPERM) $(DESTDIR)$(imagesdir)/*
 
 clean:
 




--- lib/Makefile.in.orig
+++ lib/Makefile.in
@@ -51,12 +51,12 @@
 install-only:
 	for i in `ls $(srcdir)/*.dir $(srcdir)/*.g $(srcdir)/*.imf $(srcdir)/news.txt`; do \
 		echo $$i; \
-		$(INSTALL_DATA) $(srcdir)/$$i $(gamelibdir); \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(gamelibdir); \
 	done
-	chown $(GAMEUID) $(gamelibdir) $(gamelibdir)/*
-	chgrp $(GAMEGRP) $(gamelibdir) $(gamelibdir)/*
-	chmod $(DIRPERM) $(gamelibdir)
-	chmod $(FILEPERM) $(gamelibdir)/*
+	chown $(GAMEUID) $(DESTDIR)$(gamelibdir) $(DESTDIR)$(gamelibdir)/*
+	chgrp $(GAMEGRP) $(DESTDIR)$(gamelibdir) $(DESTDIR)$(gamelibdir)/*
+	chmod $(DIRPERM) $(DESTDIR)$(gamelibdir)
+	chmod $(FILEPERM) $(DESTDIR)$(gamelibdir)/*
 
 clean:
 




--- sdl/Makefile.in.orig
+++ sdl/Makefile.in
@@ -244,10 +244,10 @@
 	else \
 		progname="$(SDLCONQ_EXEC_NAME)" ; \
 	fi; \
-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
-	chown $(GAMEUID) $(bindir)/$${progname}; \
-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
-	chmod $(GAMEPERM) $(bindir)/$${progname};
+	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
+	chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
+	chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
+	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname};
 
 install-manpages-only:
 	(cd $(x11srcdir) && $(MAKE) $(FLAGS_TO_PASS) install-manpages-only)




--- tcltk/Makefile.in.orig
+++ tcltk/Makefile.in
@@ -286,17 +286,17 @@
 install-xconq: $(PLATFORM_INSTALL_TARGETS)
 
 install-libs-only:
-	$(INSTALL_DATA) $(srcdir)/tkconq.tcl $(tcltkdir)
-	$(INSTALL_DATA) $(srcdir)/imfapp.tcl $(tcltkdir)
-	$(INSTALL_DATA) $(srcdir)/BWidget/*.* $(BWidgetdir)
-	$(INSTALL_DATA) $(srcdir)/BWidget/images/*.* $(BWidgetimagesdir)
-	$(INSTALL_DATA) $(srcdir)/BWidget/lang/*.* $(BWidgetlangdir)
-	chown $(GAMEUID) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir) \
-				     $(tcltkdir)/*.* $(BWidgetdir)/*.* $(BWidgetimagesdir)/*.* $(BWidgetlangdir)/*.*
-	chgrp $(GAMEGRP) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir) \
-				     $(tcltkdir)/*.* $(BWidgetdir)/*.* $(BWidgetimagesdir)/*.* $(BWidgetlangdir)/*.*
-	chmod $(DIRPERM) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir)
-	chmod $(FILEPERM) $(tcltkdir)/*.* $(BWidgetdir)/*.* $(BWidgetimagesdir)/*.* $(BWidgetlangdir)/*.*
+	$(INSTALL_DATA) $(srcdir)/tkconq.tcl $(DESTDIR)$(tcltkdir)
+	$(INSTALL_DATA) $(srcdir)/imfapp.tcl $(DESTDIR)$(tcltkdir)
+	$(INSTALL_DATA) $(srcdir)/BWidget/*.* $(DESTDIR)$(BWidgetdir)
+	$(INSTALL_DATA) $(srcdir)/BWidget/images/*.* $(DESTDIR)$(BWidgetimagesdir)
+	$(INSTALL_DATA) $(srcdir)/BWidget/lang/*.* $(DESTDIR)$(BWidgetlangdir)
+	chown $(GAMEUID) $(DESTDIR)$(tcltkdir) $(DESTDIR)$(BWidgetdir) $(DESTDIR)$(BWidgetimagesdir) $(DESTDIR)$(BWidgetlangdir) \
+				     $(DESTDIR)$(tcltkdir)/*.* $(DESTDIR)$(BWidgetdir)/*.* $(DESTDIR)$(BWidgetimagesdir)/*.* $(DESTDIR)$(BWidgetlangdir)/*.*
+	chgrp $(GAMEGRP) $(DESTDIR)$(tcltkdir) $(DESTDIR)$(BWidgetdir) $(DESTDIR)$(BWidgetimagesdir) $(DESTDIR)$(BWidgetlangdir) \
+				     $(DESTDIR)$(tcltkdir)/*.* $(DESTDIR)$(BWidgetdir)/*.* $(DESTDIR)$(BWidgetimagesdir)/*.* $(DESTDIR)$(BWidgetlangdir)/*.*
+	chmod $(DIRPERM) $(DESTDIR)$(tcltkdir) $(DESTDIR)$(BWidgetdir) $(DESTDIR)$(BWidgetimagesdir) $(DESTDIR)$(BWidgetlangdir)
+	chmod $(FILEPERM) $(DESTDIR)$(tcltkdir)/*.* $(DESTDIR)$(BWidgetdir)/*.* $(DESTDIR)$(BWidgetimagesdir)/*.* $(DESTDIR)$(BWidgetlangdir)/*.*
 
 install-xconq-only: $(TKCONQ_EXEC_NAME)
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
@@ -305,10 +305,10 @@
 	else \
 		progname="$(TKCONQ_EXEC_NAME)" ; \
 	fi; \
-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
-	chown $(GAMEUID) $(bindir)/$${progname}; \
-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
-	chmod $(GAMEPERM) $(bindir)/$${progname}; 
+	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
+	chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
+	chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
+	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname}; 
 
 install-imfapp-only: imfapp
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
@@ -317,10 +317,10 @@
 	else \
 		progname="imfapp" ; \
 	fi; \
-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
-	chown $(GAMEUID) $(bindir)/$${progname}; \
-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
-	chmod $(IAPPPERM) $(bindir)/$${progname};
+	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
+	chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
+	chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
+	chmod $(IAPPPERM) $(DESTDIR)$(bindir)/$${progname};
 
 install-ximfconvs-only: x2imf imf2x
 	(cd ../x11 && $(MAKE) $(FLAGS_TO_PASS) install-ximfconvs-only)




--- x11/Makefile.in.orig
+++ x11/Makefile.in
@@ -213,35 +213,35 @@
 
 install-xtconq: install-ximfconvs-only 
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
-	$(INSTALL_PROGRAM) $(XTCONQ_EXEC_NAME) $(bindir); \
-	chown $(GAMEUID) $(bindir)/xtconq; \
-	chgrp $(GAMEGRP) $(bindir)/xtconq; \
-	chmod $(GAMEPERM) $(bindir)/xtconq; \
-	$(INSTALL_DATA) Xtconq $(appdefaultsdir); \
-	$(INSTALL_DATA) Xtconq-color $(appdefaultsdir); \
-	$(INSTALL_PROGRAM) xshowimf $(bindir); \
-	chown $(GAMEUID) $(bindir)/xshowimf ; \
-	chgrp $(GAMEGRP) $(bindir)/xshowimf ; \
-	chmod $(IAPPPERM) $(bindir)/xshowimf ; \
-	$(INSTALL_DATA) XShowimf $(appdefaultsdir); \
-	$(INSTALL_DATA) XShowimf-color $(appdefaultsdir); \
-	$(INSTALL_DATA) xtconq.6 $(man6dir)
+	$(INSTALL_PROGRAM) $(XTCONQ_EXEC_NAME) $(DESTDIR)$(bindir); \
+	chown $(GAMEUID) $(DESTDIR)$(bindir)/xtconq; \
+	chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/xtconq; \
+	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/xtconq; \
+	$(INSTALL_DATA) Xtconq $(DESTDIR)$(appdefaultsdir); \
+	$(INSTALL_DATA) Xtconq-color $(DESTDIR)$(appdefaultsdir); \
+	$(INSTALL_PROGRAM) xshowimf $(DESTDIR)$(bindir); \
+	chown $(GAMEUID) $(DESTDIR)$(bindir)/xshowimf ; \
+	chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/xshowimf ; \
+	chmod $(IAPPPERM) $(DESTDIR)$(bindir)/xshowimf ; \
+	$(INSTALL_DATA) XShowimf $(DESTDIR)$(appdefaultsdir); \
+	$(INSTALL_DATA) XShowimf-color $(DESTDIR)$(appdefaultsdir); \
+	$(INSTALL_DATA) xtconq.6 $(DESTDIR)$(man6dir)
 
 # Installation of converter programs.
 
 install-ximfconvs-only: x2imf imf2x
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
-	$(INSTALL_PROGRAM) imf2x $(bindir); \
-	$(INSTALL_PROGRAM) x2imf $(bindir); \
-	chown $(GAMEUID) $(bindir)/imf2x $(bindir)/x2imf ; \
-	chgrp $(GAMEGRP) $(bindir)/imf2x $(bindir)/x2imf ; \
-	chmod $(IAPPPERM) $(bindir)/imf2x $(bindir)/x2imf
+	$(INSTALL_PROGRAM) imf2x $(DESTDIR)$(bindir); \
+	$(INSTALL_PROGRAM) x2imf $(DESTDIR)$(bindir); \
+	chown $(GAMEUID) $(DESTDIR)$(bindir)/imf2x $(DESTDIR)$(bindir)/x2imf ; \
+	chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/imf2x $(DESTDIR)$(bindir)/x2imf ; \
+	chmod $(IAPPPERM) $(DESTDIR)$(bindir)/imf2x $(DESTDIR)$(bindir)/x2imf
 
 # Installation of manpages.
 
 install-manpages-only: xconq.6
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
-	$(INSTALL_DATA) xconq.6 $(man6dir)
+	$(INSTALL_DATA) xconq.6 $(DESTDIR)$(man6dir)
 
 # Cleanliness support.
 

Lines 1-7 Link Here

(-)games/xconq/pkg-plist (+5 lines)
1	%%NOSDL%%bin/imf2x	1	%%NOSDL%%bin/imf2x
2	%%NOSDL%%bin/imfapp	2	%%NOSDL%%bin/imfapp
3	%%NOSDL%%bin/x2imf	3	%%NOSDL%%bin/x2imf
		4	@group games
		5	@mode 2555
4	bin/xconq	6	bin/xconq
		7	@mode
		8	@group
		9	man/man6/xconq.6.gz
5	%%DATADIR%%/images/3rd-age.gif	10	%%DATADIR%%/images/3rd-age.gif
6	%%DATADIR%%/images/advances.gif	11	%%DATADIR%%/images/advances.gif
7	%%DATADIR%%/images/advt12x13.gif	12	%%DATADIR%%/images/advt12x13.gif

Return to bug 185695

Lines 13-25 Link Here

(-)games/xconq/Makefile (-13 / +16 lines)
13		13
14	OPTIONS_DEFINE= SDL	14	OPTIONS_DEFINE= SDL
15		15
16	BROKEN= Does not build
17
18	USE_BZIP2= yes	16	USE_BZIP2= yes
		17	USES= compiler gmake
19	USE_XORG= x11	18	USE_XORG= x11
20	USE_GMAKE= yes
21	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
22	CFLAGS+= -Wno-deprecated-writable-strings
23	CONFIGURE_ARGS= --enable-alternate-scoresdir=${SCOREDIR} \	20	CONFIGURE_ARGS= --enable-alternate-scoresdir=${SCOREDIR} \
24	--enable-alternate-gameuser=root \	21	--enable-alternate-gameuser=root \
25	--enable-alternate-gamegroup=games	22	--enable-alternate-gamegroup=games
Lines 28-34 Link Here
28		25
29	PLIST_SUB= SCOREDIR="${SCOREDIR}"	26	PLIST_SUB= SCOREDIR="${SCOREDIR}"
30		27
31	MAN6= xconq.6
32	INFO= xconq	28	INFO= xconq
33		29
34	DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" \	30	DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" \
Lines 36-42 Link Here
36		32
37	SCOREDIR?= /var/games/xconq	33	SCOREDIR?= /var/games/xconq
38		34
39	NO_STAGE= yes
40	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
41		36
42	.if ${PORT_OPTIONS:MSDL}	37	.if ${PORT_OPTIONS:MSDL}
Lines 44-57 Link Here
44	CONFIGURE_ARGS+=--enable-default-ui=sdl	39	CONFIGURE_ARGS+=--enable-default-ui=sdl
45	PLIST_SUB+= NOSDL="@comment "	40	PLIST_SUB+= NOSDL="@comment "
46	.else	41	.else
		42	USES+= tk
47	USE_XORG+= xext xmu xt xaw	43	USE_XORG+= xext xmu xt xaw
48	USE_TK_BUILD= yes
49	USE_TK= yes
50	CONFIGURE_ARGS+=--with-tclconfig=${TCL_LIBDIR} \	44	CONFIGURE_ARGS+=--with-tclconfig=${TCL_LIBDIR} \
51	--with-tkconfig=${TK_LIBDIR}	45	--with-tkconfig=${TK_LIBDIR}
52	PLIST_SUB+= NOSDL=""	46	PLIST_SUB+= NOSDL=""
53	.endif	47	.endif
54		48
		49	.include <bsd.port.pre.mk>
		50
		51	.if ${COMPILER_TYPE} == "clang"
		52	CFLAGS+= -Wno-deprecated-writable-strings
		53	.else
		54	CFLAGS+= -Wno-write-strings
		55	.endif
		56
55	post-patch:	57	post-patch:
56	@${REINPLACE_CMD} -e \	58	@${REINPLACE_CMD} -e \
57	'/^HFLAGS/s\| $${debugging}\|\|' ${WRKSRC}/configure	59	'/^HFLAGS/s\| $${debugging}\|\|' ${WRKSRC}/configure
Lines 63-75 Link Here
63	(cd ${WRKSRC}/doc && makeinfo xconq.texi)	65	(cd ${WRKSRC}/doc && makeinfo xconq.texi)
64		66
65	post-install:	67	post-install:
66	(cd ${WRKSRC}/doc && ${INSTALL_DATA} xconq.info ${PREFIX}/${INFO_PATH})	68	(cd ${WRKSRC}/doc && ${INSTALL_DATA} xconq.info \
67	${STRIP_CMD} ${PREFIX}/bin/xconq	69	${STAGEDIR}${PREFIX}/${INFO_PATH})
		70	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xconq
68	.if empty(PORT_OPTIONS:MSDL)	71	.if empty(PORT_OPTIONS:MSDL)
69	.for i in imf2x imfapp x2imf	72	.for i in imf2x imfapp x2imf
70	${STRIP_CMD} ${PREFIX}/bin/${i}	73	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
71	.endfor	74	.endfor
72	.endif	75	.endif
73	@${FIND} ${DATADIR} -empty -delete	76	@${FIND} ${STAGEDIR}${DATADIR} -empty -delete
74		77
75	.include <bsd.port.mk>	78	.include <bsd.port.post.mk>

Line 0 Link Here

(-)games/xconq/files/patch-Makefile.in (+46 lines)
	1	--- Makefile.in.orig
	2	+++ Makefile.in
	3	@@ -274,20 +274,19 @@
	4	fi
	5
	6	MAKEDIRS= \
	7	- $(prefix) \
	8	- $(exec_prefix) \
	9	- $(bindir) \
	10	- $(datadir) \
	11	- $(gamelibdir) \
	12	- $(imagesdir) \
	13	- $(scoresdir) \
	14	- $(mandir) \
	15	- $(man6dir) \
	16	- $(infodir) \
	17	- $(tcltkdir) \
	18	- $(BWidgetdir) \
	19	- $(BWidgetimagesdir) \
	20	- $(BWidgetlangdir)
	21	+ $(DESTDIR)$(prefix) \
	22	+ $(DESTDIR)$(exec_prefix) \
	23	+ $(DESTDIR)$(bindir) \
	24	+ $(DESTDIR)$(datadir) \
	25	+ $(DESTDIR)$(gamelibdir) \
	26	+ $(DESTDIR)$(imagesdir) \
	27	+ $(DESTDIR)$(mandir) \
	28	+ $(DESTDIR)$(man6dir) \
	29	+ $(DESTDIR)$(infodir) \
	30	+ $(DESTDIR)$(tcltkdir) \
	31	+ $(DESTDIR)$(BWidgetdir) \
	32	+ $(DESTDIR)$(BWidgetimagesdir) \
	33	+ $(DESTDIR)$(BWidgetlangdir)
	34
	35	.PHONY: install-dirs
	36	install-dirs:
	37	@@ -305,9 +304,6 @@
	38	true ; \
	39	fi ; \
	40	done
	41	- chown $(GAMEUID) $(scoresdir)
	42	- chgrp $(GAMEGRP) $(scoresdir)
	43	- chmod $(DIRPERM) $(scoresdir)
	44
	45	# Build a source distribution.
	46	DIST_VERSION=@XCONQ_VERSION_FULL@

Line 0 Link Here

(-)games/xconq/files/patch-curses__Makefile.in (+19 lines)
	1	--- curses/Makefile.in.orig
	2	+++ curses/Makefile.in
	3	@@ -132,11 +132,11 @@
	4	else \
	5	progname="$(CCONQ_EXEC_NAME)" ; \
	6	fi; \
	7	- $(INSTALL_PROGRAM) $${progname} $(bindir); \
	8	- chown $(GAMEUID) $(bindir)/$${progname}; \
	9	- chgrp $(GAMEGRP) $(bindir)/$${progname}; \
	10	- chmod $(GAMEPERM) $(bindir)/$${progname}; \
	11	- $(INSTALL_DATA) cconq.6 $(man6dir)
	12	+ $(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
	13	+ chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
	14	+ chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
	15	+ chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname}; \
	16	+ $(INSTALL_DATA) cconq.6 $(DESTDIR)$(man6dir)
	17
	18	# Cleanliness support.
	19

Line 0 Link Here

(-)games/xconq/files/patch-images__Makefile.in (+25 lines)
	1	--- images/Makefile.in.orig
	2	+++ images/Makefile.in
	3	@@ -51,16 +51,16 @@
	4	install-only:
	5	for i in `ls $(srcdir)/*.gif `; do \
	6	echo $$i; \
	7	- $(INSTALL_DATA) $(srcdir)/$$i $(imagesdir); \
	8	+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(imagesdir); \
	9	done
	10	for i in `ls $(srcdir)/*.bmp `; do \
	11	echo $$i; \
	12	- $(INSTALL_DATA) $(srcdir)/$$i $(imagesdir); \
	13	+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(imagesdir); \
	14	done
	15	- chown $(GAMEUID) $(imagesdir) $(imagesdir)/*
	16	- chgrp $(GAMEGRP) $(imagesdir) $(imagesdir)/*
	17	- chmod $(DIRPERM) $(imagesdir)
	18	- chmod $(FILEPERM) $(imagesdir)/*
	19	+ chown $(GAMEUID) $(DESTDIR)$(imagesdir) $(DESTDIR)$(imagesdir)/*
	20	+ chgrp $(GAMEGRP) $(DESTDIR)$(imagesdir) $(DESTDIR)$(imagesdir)/*
	21	+ chmod $(DIRPERM) $(DESTDIR)$(imagesdir)
	22	+ chmod $(FILEPERM) $(DESTDIR)$(imagesdir)/*
	23
	24	clean:
	25

Line 0 Link Here

(-)games/xconq/files/patch-lib__Makefile.in (+20 lines)
	1	--- lib/Makefile.in.orig
	2	+++ lib/Makefile.in
	3	@@ -51,12 +51,12 @@
	4	install-only:
	5	for i in `ls $(srcdir)/.dir $(srcdir)/.g $(srcdir)/*.imf $(srcdir)/news.txt`; do \
	6	echo $$i; \
	7	- $(INSTALL_DATA) $(srcdir)/$$i $(gamelibdir); \
	8	+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(gamelibdir); \
	9	done
	10	- chown $(GAMEUID) $(gamelibdir) $(gamelibdir)/*
	11	- chgrp $(GAMEGRP) $(gamelibdir) $(gamelibdir)/*
	12	- chmod $(DIRPERM) $(gamelibdir)
	13	- chmod $(FILEPERM) $(gamelibdir)/*
	14	+ chown $(GAMEUID) $(DESTDIR)$(gamelibdir) $(DESTDIR)$(gamelibdir)/*
	15	+ chgrp $(GAMEGRP) $(DESTDIR)$(gamelibdir) $(DESTDIR)$(gamelibdir)/*
	16	+ chmod $(DIRPERM) $(DESTDIR)$(gamelibdir)
	17	+ chmod $(FILEPERM) $(DESTDIR)$(gamelibdir)/*
	18
	19	clean:
	20

Line 0 Link Here

(-)games/xconq/files/patch-sdl__Makefile.in (+17 lines)
	1	--- sdl/Makefile.in.orig
	2	+++ sdl/Makefile.in
	3	@@ -244,10 +244,10 @@
	4	else \
	5	progname="$(SDLCONQ_EXEC_NAME)" ; \
	6	fi; \
	7	- $(INSTALL_PROGRAM) $${progname} $(bindir); \
	8	- chown $(GAMEUID) $(bindir)/$${progname}; \
	9	- chgrp $(GAMEGRP) $(bindir)/$${progname}; \
	10	- chmod $(GAMEPERM) $(bindir)/$${progname};
	11	+ $(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
	12	+ chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
	13	+ chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
	14	+ chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname};
	15
	16	install-manpages-only:
	17	(cd $(x11srcdir) && $(MAKE) $(FLAGS_TO_PASS) install-manpages-only)

Line 0 Link Here

(-)games/xconq/files/patch-tcltk__Makefile.in (+61 lines)
	1	--- tcltk/Makefile.in.orig
	2	+++ tcltk/Makefile.in
	3	@@ -286,17 +286,17 @@
	4	install-xconq: $(PLATFORM_INSTALL_TARGETS)
	5
	6	install-libs-only:
	7	- $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(tcltkdir)
	8	- $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(tcltkdir)
	9	- $(INSTALL_DATA) $(srcdir)/BWidget/. $(BWidgetdir)
	10	- $(INSTALL_DATA) $(srcdir)/BWidget/images/. $(BWidgetimagesdir)
	11	- $(INSTALL_DATA) $(srcdir)/BWidget/lang/. $(BWidgetlangdir)
	12	- chown $(GAMEUID) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir) \
	13	- $(tcltkdir)/. $(BWidgetdir)/. $(BWidgetimagesdir)/. $(BWidgetlangdir)/.
	14	- chgrp $(GAMEGRP) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir) \
	15	- $(tcltkdir)/. $(BWidgetdir)/. $(BWidgetimagesdir)/. $(BWidgetlangdir)/.
	16	- chmod $(DIRPERM) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir)
	17	- chmod $(FILEPERM) $(tcltkdir)/. $(BWidgetdir)/. $(BWidgetimagesdir)/. $(BWidgetlangdir)/.
	18	+ $(INSTALL_DATA) $(srcdir)/tkconq.tcl $(DESTDIR)$(tcltkdir)
	19	+ $(INSTALL_DATA) $(srcdir)/imfapp.tcl $(DESTDIR)$(tcltkdir)
	20	+ $(INSTALL_DATA) $(srcdir)/BWidget/. $(DESTDIR)$(BWidgetdir)
	21	+ $(INSTALL_DATA) $(srcdir)/BWidget/images/. $(DESTDIR)$(BWidgetimagesdir)
	22	+ $(INSTALL_DATA) $(srcdir)/BWidget/lang/. $(DESTDIR)$(BWidgetlangdir)
	23	+ chown $(GAMEUID) $(DESTDIR)$(tcltkdir) $(DESTDIR)$(BWidgetdir) $(DESTDIR)$(BWidgetimagesdir) $(DESTDIR)$(BWidgetlangdir) \
	24	+ $(DESTDIR)$(tcltkdir)/. $(DESTDIR)$(BWidgetdir)/. $(DESTDIR)$(BWidgetimagesdir)/. $(DESTDIR)$(BWidgetlangdir)/.
	25	+ chgrp $(GAMEGRP) $(DESTDIR)$(tcltkdir) $(DESTDIR)$(BWidgetdir) $(DESTDIR)$(BWidgetimagesdir) $(DESTDIR)$(BWidgetlangdir) \
	26	+ $(DESTDIR)$(tcltkdir)/. $(DESTDIR)$(BWidgetdir)/. $(DESTDIR)$(BWidgetimagesdir)/. $(DESTDIR)$(BWidgetlangdir)/.
	27	+ chmod $(DIRPERM) $(DESTDIR)$(tcltkdir) $(DESTDIR)$(BWidgetdir) $(DESTDIR)$(BWidgetimagesdir) $(DESTDIR)$(BWidgetlangdir)
	28	+ chmod $(FILEPERM) $(DESTDIR)$(tcltkdir)/. $(DESTDIR)$(BWidgetdir)/. $(DESTDIR)$(BWidgetimagesdir)/. $(DESTDIR)$(BWidgetlangdir)/.
	29
	30	install-xconq-only: $(TKCONQ_EXEC_NAME)
	31	srcroot=`cd $(srcroot); pwd`; export srcroot; \
	32	@@ -305,10 +305,10 @@
	33	else \
	34	progname="$(TKCONQ_EXEC_NAME)" ; \
	35	fi; \
	36	- $(INSTALL_PROGRAM) $${progname} $(bindir); \
	37	- chown $(GAMEUID) $(bindir)/$${progname}; \
	38	- chgrp $(GAMEGRP) $(bindir)/$${progname}; \
	39	- chmod $(GAMEPERM) $(bindir)/$${progname};
	40	+ $(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
	41	+ chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
	42	+ chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
	43	+ chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname};
	44
	45	install-imfapp-only: imfapp
	46	srcroot=`cd $(srcroot); pwd`; export srcroot; \
	47	@@ -317,10 +317,10 @@
	48	else \
	49	progname="imfapp" ; \
	50	fi; \
	51	- $(INSTALL_PROGRAM) $${progname} $(bindir); \
	52	- chown $(GAMEUID) $(bindir)/$${progname}; \
	53	- chgrp $(GAMEGRP) $(bindir)/$${progname}; \
	54	- chmod $(IAPPPERM) $(bindir)/$${progname};
	55	+ $(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
	56	+ chown $(GAMEUID) $(DESTDIR)$(bindir)/$${progname}; \
	57	+ chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/$${progname}; \
	58	+ chmod $(IAPPPERM) $(DESTDIR)$(bindir)/$${progname};
	59
	60	install-ximfconvs-only: x2imf imf2x
	61	(cd ../x11 && $(MAKE) $(FLAGS_TO_PASS) install-ximfconvs-only)

Line 0 Link Here

(-)games/xconq/files/patch-x11__Makefile.in (+57 lines)
	1	--- x11/Makefile.in.orig
	2	+++ x11/Makefile.in
	3	@@ -213,35 +213,35 @@
	4
	5	install-xtconq: install-ximfconvs-only
	6	srcroot=`cd $(srcroot); pwd`; export srcroot; \
	7	- $(INSTALL_PROGRAM) $(XTCONQ_EXEC_NAME) $(bindir); \
	8	- chown $(GAMEUID) $(bindir)/xtconq; \
	9	- chgrp $(GAMEGRP) $(bindir)/xtconq; \
	10	- chmod $(GAMEPERM) $(bindir)/xtconq; \
	11	- $(INSTALL_DATA) Xtconq $(appdefaultsdir); \
	12	- $(INSTALL_DATA) Xtconq-color $(appdefaultsdir); \
	13	- $(INSTALL_PROGRAM) xshowimf $(bindir); \
	14	- chown $(GAMEUID) $(bindir)/xshowimf ; \
	15	- chgrp $(GAMEGRP) $(bindir)/xshowimf ; \
	16	- chmod $(IAPPPERM) $(bindir)/xshowimf ; \
	17	- $(INSTALL_DATA) XShowimf $(appdefaultsdir); \
	18	- $(INSTALL_DATA) XShowimf-color $(appdefaultsdir); \
	19	- $(INSTALL_DATA) xtconq.6 $(man6dir)
	20	+ $(INSTALL_PROGRAM) $(XTCONQ_EXEC_NAME) $(DESTDIR)$(bindir); \
	21	+ chown $(GAMEUID) $(DESTDIR)$(bindir)/xtconq; \
	22	+ chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/xtconq; \
	23	+ chmod $(GAMEPERM) $(DESTDIR)$(bindir)/xtconq; \
	24	+ $(INSTALL_DATA) Xtconq $(DESTDIR)$(appdefaultsdir); \
	25	+ $(INSTALL_DATA) Xtconq-color $(DESTDIR)$(appdefaultsdir); \
	26	+ $(INSTALL_PROGRAM) xshowimf $(DESTDIR)$(bindir); \
	27	+ chown $(GAMEUID) $(DESTDIR)$(bindir)/xshowimf ; \
	28	+ chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/xshowimf ; \
	29	+ chmod $(IAPPPERM) $(DESTDIR)$(bindir)/xshowimf ; \
	30	+ $(INSTALL_DATA) XShowimf $(DESTDIR)$(appdefaultsdir); \
	31	+ $(INSTALL_DATA) XShowimf-color $(DESTDIR)$(appdefaultsdir); \
	32	+ $(INSTALL_DATA) xtconq.6 $(DESTDIR)$(man6dir)
	33
	34	# Installation of converter programs.
	35
	36	install-ximfconvs-only: x2imf imf2x
	37	srcroot=`cd $(srcroot); pwd`; export srcroot; \
	38	- $(INSTALL_PROGRAM) imf2x $(bindir); \
	39	- $(INSTALL_PROGRAM) x2imf $(bindir); \
	40	- chown $(GAMEUID) $(bindir)/imf2x $(bindir)/x2imf ; \
	41	- chgrp $(GAMEGRP) $(bindir)/imf2x $(bindir)/x2imf ; \
	42	- chmod $(IAPPPERM) $(bindir)/imf2x $(bindir)/x2imf
	43	+ $(INSTALL_PROGRAM) imf2x $(DESTDIR)$(bindir); \
	44	+ $(INSTALL_PROGRAM) x2imf $(DESTDIR)$(bindir); \
	45	+ chown $(GAMEUID) $(DESTDIR)$(bindir)/imf2x $(DESTDIR)$(bindir)/x2imf ; \
	46	+ chgrp $(GAMEGRP) $(DESTDIR)$(bindir)/imf2x $(DESTDIR)$(bindir)/x2imf ; \
	47	+ chmod $(IAPPPERM) $(DESTDIR)$(bindir)/imf2x $(DESTDIR)$(bindir)/x2imf
	48
	49	# Installation of manpages.
	50
	51	install-manpages-only: xconq.6
	52	srcroot=`cd $(srcroot); pwd`; export srcroot; \
	53	- $(INSTALL_DATA) xconq.6 $(man6dir)
	54	+ $(INSTALL_DATA) xconq.6 $(DESTDIR)$(man6dir)
	55
	56	# Cleanliness support.
	57