Attachment #171462 for bug #197129

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

Lines 3-9 Link Here

(-)scid/Makefile (-3 / +1 lines)
3		3
4	PORTNAME= scid	4	PORTNAME= scid
5	PORTVERSION= 4.6.2	5	PORTVERSION= 4.6.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= games databases	7	CATEGORIES= games databases
8	MASTER_SITES= SF/${PORTNAME}/Scid/Scid%204.6/	8	MASTER_SITES= SF/${PORTNAME}/Scid/Scid%204.6/
9		9
Lines 31-38 Link Here
31	OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \	31	OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \
32	WARNINGS=""	32	WARNINGS=""
33		33
34	ALL_TARGET= all strip
35
36	post-configure:	34	post-configure:
37	@${REINPLACE_CMD} -e 's\|g++\|${CXX}\|g; s\|gcc\|${CC}\|g' \	35	@${REINPLACE_CMD} -e 's\|g++\|${CXX}\|g; s\|gcc\|${CC}\|g' \
38	${WRKSRC}/Makefile \	36	${WRKSRC}/Makefile \




--- Makefile.conf.orig	2015-07-05 08:23:10.000000000 +0200
+++ Makefile.conf	2016-06-15 15:17:03.873995000 +0200
@@ -156,32 +156,35 @@
 install: $(INSTALL)
 
 install_scid: all_scid

-	cp -r ./img/* "$(SHAREDIR)/img/"
-	install -m 755 -d "$(SHAREDIR)/tcl/"
-	cp -r ./tcl/* "$(SHAREDIR)/tcl/"
+	install -d "$(DESTDIR)$(BINDIR)"
+	${BSD_INSTALL_PROGRAM} $(EXECS) "$(DESTDIR)$(BINDIR)"
+	${BSD_INSTALL_SCRIPT} $(SCRIPTS) "$(DESTDIR)$(BINDIR)"
+	rm -f scid.sh
+	@echo "#!/bin/sh" > scid.sh
+	@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> scid.sh
+	${BSD_INSTALL_SCRIPT} scid.sh "$(DESTDIR)$(BINDIR)/scid"
+	install -d "$(DESTDIR)$(SHAREDIR)"
+	${BSD_INSTALL_DATA} -p scid.eco "$(DESTDIR)$(SHAREDIR)"
+	install -d "$(DESTDIR)$(SHAREDIR)/books"
+	${BSD_INSTALL_DATA} ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
+	install -d "$(DESTDIR)$(SHAREDIR)/bases"
+	if test -d ./bases; then ${INSTALL_DATA} ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
+	install -d "$(DESTDIR)$(SHAREDIR)/html"
+	${BSD_INSTALL_DATA} ./html/*.* "$(DESTDIR)$(SHAREDIR)/html/"
+	install -d "$(DESTDIR)$(SHAREDIR)/html/bitmaps"
+	${BSD_INSTALL_DATA} ./html/bitmaps/*.* "$(DESTDIR)$(SHAREDIR)/html/bitmaps/"
+	install -d "$(DESTDIR)$(SHAREDIR)/html/bitmaps/mini"
+	${BSD_INSTALL_DATA} ./html/bitmaps/mini/* "$(DESTDIR)$(SHAREDIR)/html/bitmaps/mini"
+	find img -type d -exec install -d "$(DESTDIR)$(SHAREDIR)/{}" \;
+	find img -type f -exec ${BSD_INSTALL_DATA} {} "$(DESTDIR)$(SHAREDIR)/{}" \;
+	find tcl -type d -exec install -d "$(DESTDIR)$(SHAREDIR)/{}" \;
+	find tcl -type f -exec ${BSD_INSTALL_DATA} {} "$(DESTDIR)$(SHAREDIR)/{}" \;
 
 install_engines: all_engines
-	install -m 755 -d "$(SHAREDIR)/engines"

-	install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"
-	install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"
-	install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"
+	install -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
+	${BSD_INSTALL_PROGRAM} ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
+	install -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
+	${BSD_INSTALL_PROGRAM} ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
+	install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
 
 install_mac: all
 	install -m 755 -d dist/Scid.app/Contents/MacOS
@@ -261,7 +264,7 @@
 
 ### To make the executable files smaller: type "make strip".
 #

Return to bug 197129

Lines 1-6 Link Here

(-)scid/files/patch-Makefile.conf (-28 / +31 lines)
1	--- Makefile.conf.orig 2015-07-05 06:23:10 UTC	1	--- Makefile.conf.orig 2015-07-05 08:23:10.000000000 +0200
2	+++ Makefile.conf	2	+++ Makefile.conf 2016-06-15 15:17:03.873995000 +0200
3	@@ -156,32 +156,32 @@ toga:	3	@@ -156,32 +156,35 @@
4	install: $(INSTALL)	4	install: $(INSTALL)
5		5
6	install_scid: all_scid	6	install_scid: all_scid
Lines 23-47 Link Here
23	- cp -r ./img/* "$(SHAREDIR)/img/"	23	- cp -r ./img/* "$(SHAREDIR)/img/"
24	- install -m 755 -d "$(SHAREDIR)/tcl/"	24	- install -m 755 -d "$(SHAREDIR)/tcl/"
25	- cp -r ./tcl/* "$(SHAREDIR)/tcl/"	25	- cp -r ./tcl/* "$(SHAREDIR)/tcl/"
26	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)"	26	+ install -d "$(DESTDIR)$(BINDIR)"
27	+ install -m 755 -d "$(DESTDIR)$(BINDIR)"	27	+ ${BSD_INSTALL_PROGRAM} $(EXECS) "$(DESTDIR)$(BINDIR)"
28	+ install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"	28	+ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) "$(DESTDIR)$(BINDIR)"
29	+ rm -f "$(DESTDIR)$(BINDIR)/scid"	29	+ rm -f scid.sh
30	+ @echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid"	30	+ @echo "#!/bin/sh" > scid.sh
31	+ @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid"	31	+ @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> scid.sh
32	+ chmod 755 "$(DESTDIR)$(BINDIR)/scid"	32	+ ${BSD_INSTALL_SCRIPT} scid.sh "$(DESTDIR)$(BINDIR)/scid"
33	+ chmod +x "$(DESTDIR)$(BINDIR)/scid"	33	+ install -d "$(DESTDIR)$(SHAREDIR)"
34	+ install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"	34	+ ${BSD_INSTALL_DATA} -p scid.eco "$(DESTDIR)$(SHAREDIR)"
35	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"	35	+ install -d "$(DESTDIR)$(SHAREDIR)/books"
36	+ install -m 666 ./books/. "$(DESTDIR)$(SHAREDIR)/books/"	36	+ ${BSD_INSTALL_DATA} ./books/. "$(DESTDIR)$(SHAREDIR)/books/"
37	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"	37	+ install -d "$(DESTDIR)$(SHAREDIR)/bases"
38	+ if test -d ./bases; then install -m 666 ./bases/. "$(DESTDIR)$(SHAREDIR)/bases/" ; fi	38	+ if test -d ./bases; then ${INSTALL_DATA} ./bases/. "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
39	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"	39	+ install -d "$(DESTDIR)$(SHAREDIR)/html"
40	+ cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"	40	+ ${BSD_INSTALL_DATA} ./html/. "$(DESTDIR)$(SHAREDIR)/html/"
41	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"	41	+ install -d "$(DESTDIR)$(SHAREDIR)/html/bitmaps"
42	+ cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"	42	+ ${BSD_INSTALL_DATA} ./html/bitmaps/. "$(DESTDIR)$(SHAREDIR)/html/bitmaps/"
43	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/tcl/"	43	+ install -d "$(DESTDIR)$(SHAREDIR)/html/bitmaps/mini"
44	+ cp -r ./tcl/* "$(DESTDIR)$(SHAREDIR)/tcl/"	44	+ ${BSD_INSTALL_DATA} ./html/bitmaps/mini/* "$(DESTDIR)$(SHAREDIR)/html/bitmaps/mini"
		45	+ find img -type d -exec install -d "$(DESTDIR)$(SHAREDIR)/{}" \;
		46	+ find img -type f -exec ${BSD_INSTALL_DATA} {} "$(DESTDIR)$(SHAREDIR)/{}" \;
		47	+ find tcl -type d -exec install -d "$(DESTDIR)$(SHAREDIR)/{}" \;
		48	+ find tcl -type f -exec ${BSD_INSTALL_DATA} {} "$(DESTDIR)$(SHAREDIR)/{}" \;
45		49
46	install_engines: all_engines	50	install_engines: all_engines
47	- install -m 755 -d "$(SHAREDIR)/engines"	51	- install -m 755 -d "$(SHAREDIR)/engines"
Lines 49-63 Link Here
49	- install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"	53	- install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"
50	- install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"	54	- install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"
51	- install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"	55	- install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"
52	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"	56	+ install -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
53	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"	57	+ ${BSD_INSTALL_PROGRAM} ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
54	+ install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"	58	+ install -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
55	+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"	59	+ ${BSD_INSTALL_PROGRAM} ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
56	+ install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
57		60
58	install_mac: all	61	install_mac: all
59	install -m 755 -d dist/Scid.app/Contents/MacOS	62	install -m 755 -d dist/Scid.app/Contents/MacOS
60	@@ -261,7 +261,7 @@ clean:	63	@@ -261,7 +264,7 @@
61		64
62	### To make the executable files smaller: type "make strip".	65	### To make the executable files smaller: type "make strip".
63	#	66	#