summaryrefslogtreecommitdiff
path: root/graphics/tuxpaint-config/patches/patch-aa
blob: 8fafc4d6b58ba4fd254a0f9503d817f3eb5ca1e3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
$NetBSD: patch-aa,v 1.5 2014/08/23 21:40:47 wiz Exp $

--- Makefile.orig	2011-02-22 18:57:26.000000000 +0000
+++ Makefile
@@ -20,7 +20,7 @@ VER_DATE=`date +"%Y-%m-%d"`
 
 # Where to install things:
 
-PREFIX=/usr/local
+#PREFIX=/usr/local
 
 
 # Program:
@@ -37,7 +37,7 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint-con
 # Docs and man page:
 
 DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
-MAN_PREFIX=$(PREFIX)/share/man/
+MAN_PREFIX=$(PREFIX)/${PKGMANDIR}
 
 
 # Tux Paint's 'System-wide' Config file:
@@ -84,7 +84,7 @@ FLTK_LIBS=`fltk-config --ldflags`
 PAPER_LIB=-lpaper
 
 # Default CFLAGS:
-CFLAGS=-O2 -Wall
+CFLAGS+=-Wall
 
 # The entire set of CFLAGS:
 ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
@@ -154,8 +154,7 @@ install-win32:
 # to do this as superuser ("root"))
 
 install:	install-bin install-data install-man install-doc \
-		install-gnome install-kde install-kde-icons \
-		install-icon install-gettext
+		install-gettext
 	@echo
 	@echo "All done! Now (preferably NOT as 'root' superuser),"
 	@echo "you can type the command 'tuxpaint-config' to run the"
@@ -255,8 +254,7 @@ install-icon:
 install-bin:
 	@echo
 	@echo "...Installing program itself..."
-	@cp tuxpaint-config $(BIN_PREFIX)
-	@chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint-config$(EXE_EXT)
+	${BSD_INSTALL_PROGRAM} tuxpaint-config $(BIN_PREFIX)
 
 
 # Install the data (sound, graphics, fonts):
@@ -264,7 +262,7 @@ install-bin:
 install-data:
 	@echo
 	@echo "...Installing data files..."
-	@install -d $(DATA_PREFIX)
+	${BSD_INSTALL_DATA_DIR} $(DATA_PREFIX)
 	@cp -R data/* $(DATA_PREFIX)
 	@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
 
@@ -275,28 +273,22 @@ install-doc:
 	@echo
 	@echo "...Installing documentation..."
 	@echo "(English)"
-	@install -d $(DOC_PREFIX)
-	@install -d $(DOC_PREFIX)/html
-	@cp docs/AUTHORS.txt $(DOC_PREFIX)
-	@cp docs/CHANGES.txt $(DOC_PREFIX)
-	@cp docs/COPYING.txt $(DOC_PREFIX)
-	@cp docs/README.txt $(DOC_PREFIX)
-	@cp docs/html/README.html $(DOC_PREFIX)/html
-	@cp docs/TODO.txt $(DOC_PREFIX)
-	@echo "(...Setting permissions)"
-	@chmod -R a+rx,g-w,o-w $(DOC_PREFIX)
+	${BSD_INSTALL_DATA_DIR} $(DOC_PREFIX)
+	${BSD_INSTALL_DATA_DIR} $(DOC_PREFIX)/html
+	${BSD_INSTALL_DATA} docs/AUTHORS.txt $(DOC_PREFIX)
+	${BSD_INSTALL_DATA} docs/CHANGES.txt $(DOC_PREFIX)
+	${BSD_INSTALL_DATA} docs/COPYING.txt $(DOC_PREFIX)
+	${BSD_INSTALL_DATA} docs/README.txt $(DOC_PREFIX)
+	${BSD_INSTALL_DATA} docs/html/README.html $(DOC_PREFIX)/html
+	${BSD_INSTALL_DATA} docs/TODO.txt $(DOC_PREFIX)
 
 
 # Install the man page:
 
 install-man:
 	@echo "...Installing man pages..."
-	# man1 directory...
-	@install -d $(MAN_PREFIX)/man1/
 	# tuxpaint-config.1
-	@cp src/tuxpaint-config.1 $(MAN_PREFIX)/man1/
-	@gzip -9f $(MAN_PREFIX)/man1/tuxpaint-config.1
-	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-config.1.gz
+	${BSD_INSTALL_MAN} src/tuxpaint-config.1 $(MAN_PREFIX)/man1/
 
 
 # Build the program!
@@ -306,7 +298,7 @@ tuxpaint-config:	obj/tuxpaint-config.o o
 	@echo Linking
 	$(CXX) $(ALL_CFLAGS) -o tuxpaint-config obj/tuxpaint-config.o 	\
 			obj/tuxpaint-config2.o obj/defaults.o $(ARCH_LIBS) \
-			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB)
+			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB) -lintl
 
 
 # Build the object for the program!
@@ -338,9 +330,13 @@ obj/resource.o:	visualc/resource.rc visu
 POFILES:=$(wildcard src/po/*.po)
 MOFILES:=$(patsubst src/po/%.po,trans/%.mo,$(POFILES))
 INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))
+INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES))
 
+$(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo
+	install -d -m 755 $@
 $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo
-	install -D -m 644 $< $@
+	install -m 644 $< $@
+
 
 .PHONY: uninstall-i18n
 uninstall-i18n:
@@ -364,7 +360,8 @@ install-gettext:
 	@echo "You will not be able to run Tux Paint in non-U.S. English modes."
 	@echo "--------------------------------------------------------------"
 else
-install-gettext: $(INSTALLED_MOFILES)
+install-gettextdirs: $(INSTALLED_MODIRS)
+install-gettext: install-gettextdirs $(INSTALLED_MOFILES)
 endif