Attachment #146823 for bug #193324




# $FreeBSD: head/games/tuxpaint-config/Makefile 358556 2014-06-20 11:15:57Z amdmi3 $

PORTNAME=	tuxpaint-config
PORTVERSION=	0.0.13
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	SF/tuxpaint/${PORTNAME}/${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Graphical tool to change TuxPaint settings

LICENSE=	GPLv2 # (or later)

LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper \
		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
RUN_DEPENDS=	tuxpaint:${PORTSDIR}/games/tuxpaint

USES=		gettext gmake
MAKE_ARGS=	PREFIX="${PREFIX}" \
		MAN_PREFIX="${STAGEDIR}${MANPREFIX}/man" \
		X11_ICON_PREFIX="${STAGEDIR}${PREFIX}/share/pixmaps/" \
		GNOME_PREFIX="${PREFIX}" \
		CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
		ARCH_LINKS="-L${LOCALBASE}/lib -lintl"
INSTALL_TARGET=	install-bin install-data install-man install-gettext \
		install-doc install-gnome
MAKE_JOBS_UNSAFE=yes

OPTIONS_DEFINE=	DOCS

post-extract:
	@${CHMOD} -R a+rX ${WRKSRC}
		${WRKSRC}/Makefile

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)games/tuxpaint-config/distinfo (-2 / +2 lines)
1	SHA256 (tuxpaint-config-0.0.12.tar.gz) = 9395a1c92e52c3420cabaa0c781b607e6832b5d9b6180902615f102216e1c8fd	1	SHA256 (tuxpaint-config-0.0.13.tar.gz) = db38058f1e1cc60b15bcaf565118fe41dc9be20435e1b787c607f95d0dd122fc
2	SIZE (tuxpaint-config-0.0.12.tar.gz) = 260444	2	SIZE (tuxpaint-config-0.0.13.tar.gz) = 451667




--- Makefile.orig	2009-05-29 07:08:08.000000000 +0900
+++ Makefile	2010-10-19 01:39:29.000000000 +0900
@@ -25,19 +25,19 @@
 
 # Program:
 
-BIN_PREFIX=$(PREFIX)/bin
+BIN_PREFIX=$(DESTDIR)$(PREFIX)/bin
 EXE_EXT=
 
 
 # Data:
 
-DATA_PREFIX=$(PREFIX)/share/tuxpaint-config/
+DATA_PREFIX=$(DESTDIR)$(PREFIX)/share/tuxpaint-config/
 
 
 # Docs and man page:
 
-DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
-MAN_PREFIX=$(PREFIX)/share/man/
+DOC_PREFIX=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-config/
+MAN_PREFIX=$(DESTDIR)$(PREFIX)/man/
 
 
 # Tux Paint's 'System-wide' Config file:
@@ -45,14 +45,14 @@
 ifeq ($(PREFIX),/usr)
   CONFDIR=/etc/tuxpaint
 else
-  CONFDIR=$(PREFIX)/etc/tuxpaint
+  CONFDIR=$(DESTDIR)$(PREFIX)/etc/tuxpaint
 endif
 
 
 # Icons and launchers:
 
-ICON_PREFIX=$(PREFIX)/share/pixmaps/
-X11_ICON_PREFIX=$(PREFIX)/X11R6/include/X11/pixmaps/
+ICON_PREFIX=$(DESTDIR)$(PREFIX)/share/pixmaps/
+X11_ICON_PREFIX=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps/
 GNOME_PREFIX=$(shell gnome-config --prefix 2> /dev/null)
 KDE_PREFIX=$(shell kde-config --install apps --expandvars 2> /dev/null)
 KDE_ICON_PREFIX=$(shell kde-config --install icon --expandvars 2> /dev/null)
@@ -60,7 +60,7 @@
 
 # Locale files
 
-LOCALE_PREFIX=$(PREFIX)/share/locale/
+LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/share/locale/
 # LOCALE_PREFIX=/usr/share/locale/
 
 
@@ -87,9 +87,12 @@
 CFLAGS=-O2 -Wall
 
 # The entire set of CFLAGS:
-ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-	-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
-	-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\" \
+ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) \
+	-DDATA_PREFIX=\"$(patsubst $(DESTDIR)%,%,$(DATA_PREFIX))\" \
+	-D$(NOSOUNDFLAG) \
+	-DDOC_PREFIX=\"$(patsubst $(DESTDIR)%,%,$(DOC_PREFIX))\" \
+	-DLOCALEDIR=\"$(patsubst $(DESTDIR)%,%,$(LOCALE_PREFIX))\" \
+	-DCONFDIR=\"$(patsubst $(DESTDIR)%,%,$(CONFDIR))\" \
 	-DVER_VERSION=\"$(VER_VERSION)\" -DVER_DATE=\"$(VER_DATE)\"
 
 
@@ -203,12 +206,12 @@
 	@echo
 	@echo "...Installing launcher icon into GNOME..."
 	@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
-  	  install -d $(GNOME_PREFIX)/share/pixmaps; \
-	  cp data/images/icon.png $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
-	  chmod 644 $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
-	  install -d $(GNOME_PREFIX)/share/applications; \
-	  cp src/tuxpaint-config.desktop $(GNOME_PREFIX)/share/applications/; \
-	  chmod 644 $(GNOME_PREFIX)/share/applications/tuxpaint-config.desktop; \
+  	  install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
+	  cp data/images/icon.png $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
+	  chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
+	  install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
+	  cp src/tuxpaint-config.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
+	  chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint-config.desktop; \
 	fi
 
 
@@ -255,7 +258,7 @@
 install-bin:
 	@echo
 	@echo "...Installing program itself..."
-	@cp tuxpaint-config $(BIN_PREFIX)
+	$(BSD_INSTALL_PROGRAM) tuxpaint-config $(BIN_PREFIX)
 	@chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint-config$(EXE_EXT)
 
 
@@ -340,7 +343,8 @@
 INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))
 
 $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo

Lines 1-7 Link Here

(-)games/tuxpaint-config/pkg-descr (-5 / +5 lines)
1	Tux Paint is a free drawing program designed for young children (kids ages 3	1	Tux Paint is a free drawing program designed for young children (kids
2	and up). It has a simple, easy-to-use interface, fun sound effects, and an	2	ages 3 and up). It has a simple, easy-to-use interface, fun sound
3	encouraging cartoon mascot who helps guide children as they use the program.	3	effects, and an encouraging cartoon mascot who helps guide children as
4	It provides a blank canvas and a variety of drawing tools to help your child	4	they use the program. It provides a blank canvas and a variety of
5	be creative.	5	drawing tools to help your child be creative.
6		6
7	WWW: http://www.tuxpaint.org/	7	WWW: http://www.tuxpaint.org/

Lines 1-30 Link Here

(-)games/tuxpaint-config/pkg-plist (-1 / +33 lines)
1	bin/tuxpaint-config	1	bin/tuxpaint-config
2	man/man1/tuxpaint-config.1.gz	2	man/man1/tuxpaint-config.1.gz
		3	share/applications/tuxpaint-config.desktop
3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt	4	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
4	%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt	5	%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
5	%%PORTDOCS%%%%DOCSDIR%%/COPYING.txt	6	%%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
6	%%PORTDOCS%%%%DOCSDIR%%/README.txt	7	%%PORTDOCS%%%%DOCSDIR%%/README.txt
7	%%PORTDOCS%%%%DOCSDIR%%/TODO.txt	8	%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
8	%%PORTDOCS%%%%DOCSDIR%%/html/README.html	9	%%PORTDOCS%%%%DOCSDIR%%/html/README.html
		10	share/locale/ach/LC_MESSAGES/tuxpaint-config.mo
		11	share/locale/an/LC_MESSAGES/tuxpaint-config.mo
		12	share/locale/ar/LC_MESSAGES/tuxpaint-config.mo
		13	share/locale/ast/LC_MESSAGES/tuxpaint-config.mo
		14	share/locale/bg/LC_MESSAGES/tuxpaint-config.mo
9	share/locale/ca/LC_MESSAGES/tuxpaint-config.mo	15	share/locale/ca/LC_MESSAGES/tuxpaint-config.mo
		16	share/locale/cgg/LC_MESSAGES/tuxpaint-config.mo
		17	share/locale/cs/LC_MESSAGES/tuxpaint-config.mo
10	share/locale/da/LC_MESSAGES/tuxpaint-config.mo	18	share/locale/da/LC_MESSAGES/tuxpaint-config.mo
		19	share/locale/de/LC_MESSAGES/tuxpaint-config.mo
11	share/locale/el/LC_MESSAGES/tuxpaint-config.mo	20	share/locale/el/LC_MESSAGES/tuxpaint-config.mo
12	share/locale/en_GB/LC_MESSAGES/tuxpaint-config.mo	21	share/locale/en_GB/LC_MESSAGES/tuxpaint-config.mo
		22	share/locale/eo/LC_MESSAGES/tuxpaint-config.mo
13	share/locale/es/LC_MESSAGES/tuxpaint-config.mo	23	share/locale/es/LC_MESSAGES/tuxpaint-config.mo
		24	share/locale/eu/LC_MESSAGES/tuxpaint-config.mo
		25	share/locale/ff/LC_MESSAGES/tuxpaint-config.mo
		26	share/locale/fi/LC_MESSAGES/tuxpaint-config.mo
14	share/locale/fr/LC_MESSAGES/tuxpaint-config.mo	27	share/locale/fr/LC_MESSAGES/tuxpaint-config.mo
		28	share/locale/gd/LC_MESSAGES/tuxpaint-config.mo
		29	share/locale/hi/LC_MESSAGES/tuxpaint-config.mo
		30	share/locale/hy/LC_MESSAGES/tuxpaint-config.mo
		31	share/locale/id/LC_MESSAGES/tuxpaint-config.mo
15	share/locale/it/LC_MESSAGES/tuxpaint-config.mo	32	share/locale/it/LC_MESSAGES/tuxpaint-config.mo
		33	share/locale/iu/LC_MESSAGES/tuxpaint-config.mo
16	share/locale/ja/LC_MESSAGES/tuxpaint-config.mo	34	share/locale/ja/LC_MESSAGES/tuxpaint-config.mo
		35	share/locale/ka/LC_MESSAGES/tuxpaint-config.mo
		36	share/locale/lv/LC_MESSAGES/tuxpaint-config.mo
		37	share/locale/mn/LC_MESSAGES/tuxpaint-config.mo
		38	share/locale/ms/LC_MESSAGES/tuxpaint-config.mo
17	share/locale/nl/LC_MESSAGES/tuxpaint-config.mo	39	share/locale/nl/LC_MESSAGES/tuxpaint-config.mo
18	share/locale/nn/LC_MESSAGES/tuxpaint-config.mo	40	share/locale/nn/LC_MESSAGES/tuxpaint-config.mo
		41	share/locale/pl/LC_MESSAGES/tuxpaint-config.mo
		42	share/locale/pt/LC_MESSAGES/tuxpaint-config.mo
19	share/locale/pt_BR/LC_MESSAGES/tuxpaint-config.mo	43	share/locale/pt_BR/LC_MESSAGES/tuxpaint-config.mo
20	share/locale/pt_PT/LC_MESSAGES/tuxpaint-config.mo	44	share/locale/ro/LC_MESSAGES/tuxpaint-config.mo
21	share/locale/ru/LC_MESSAGES/tuxpaint-config.mo	45	share/locale/ru/LC_MESSAGES/tuxpaint-config.mo
		46	share/locale/sat/LC_MESSAGES/tuxpaint-config.mo
22	share/locale/sk/LC_MESSAGES/tuxpaint-config.mo	47	share/locale/sk/LC_MESSAGES/tuxpaint-config.mo
23	share/locale/sl/LC_MESSAGES/tuxpaint-config.mo	48	share/locale/sl/LC_MESSAGES/tuxpaint-config.mo
24	share/locale/son/LC_MESSAGES/tuxpaint-config.mo	49	share/locale/son/LC_MESSAGES/tuxpaint-config.mo
		50	share/locale/sr/LC_MESSAGES/tuxpaint-config.mo
		51	share/locale/sr@latin/LC_MESSAGES/tuxpaint-config.mo
25	share/locale/sv/LC_MESSAGES/tuxpaint-config.mo	52	share/locale/sv/LC_MESSAGES/tuxpaint-config.mo
		53	share/locale/tr/LC_MESSAGES/tuxpaint-config.mo
26	share/locale/uk/LC_MESSAGES/tuxpaint-config.mo	54	share/locale/uk/LC_MESSAGES/tuxpaint-config.mo
		55	share/locale/vec/LC_MESSAGES/tuxpaint-config.mo
		56	share/locale/vi/LC_MESSAGES/tuxpaint-config.mo
27	share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo	57	share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo
		58	share/locale/zu/LC_MESSAGES/tuxpaint-config.mo
		59	share/pixmaps/tuxpaint-config.png
28	%%DATADIR%%/images/icon-win32.ico	60	%%DATADIR%%/images/icon-win32.ico
29	%%DATADIR%%/images/icon.png	61	%%DATADIR%%/images/icon.png
30	%%DATADIR%%/images/icon16x16.png	62	%%DATADIR%%/images/icon16x16.png

Return to bug 193324

Lines 2-32 Link Here

(-)games/tuxpaint-config/Makefile (-8 / +10 lines)
2	# $FreeBSD: head/games/tuxpaint-config/Makefile 358556 2014-06-20 11:15:57Z amdmi3 $	2	# $FreeBSD: head/games/tuxpaint-config/Makefile 358556 2014-06-20 11:15:57Z amdmi3 $
3		3
4	PORTNAME= tuxpaint-config	4	PORTNAME= tuxpaint-config
5	PORTVERSION= 0.0.12	5	PORTVERSION= 0.0.13
6	PORTREVISION= 2
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= SF/tuxpaint/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/tuxpaint/${PORTNAME}/${PORTVERSION}
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Graphical tool to change TuxPaint settings	10	COMMENT= Graphical tool to change TuxPaint settings
12		11
		12	LICENSE= GPLv2 # (or later)
		13
13	LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper \	14	LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper \
14	libfltk.so:${PORTSDIR}/x11-toolkits/fltk	15	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
15	RUN_DEPENDS= tuxpaint:${PORTSDIR}/games/tuxpaint	16	RUN_DEPENDS= tuxpaint:${PORTSDIR}/games/tuxpaint
16		17
17	USES= gettext gmake	18	USES= gettext gmake
18	MAKE_ARGS= PREFIX="${PREFIX}" \	19	MAKE_ARGS= PREFIX="${PREFIX}" \
19	MAN_PREFIX="${MANPREFIX}/man" \	20	MAN_PREFIX="${STAGEDIR}${MANPREFIX}/man" \
20	X11_ICON_PREFIX="${PREFIX}/share/pixmaps/" \	21	X11_ICON_PREFIX="${STAGEDIR}${PREFIX}/share/pixmaps/" \
		22	GNOME_PREFIX="${PREFIX}" \
21	CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \	23	CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
22	ARCH_LINKS="-L${LOCALBASE}/lib -lintl"	24	ARCH_LINKS="-L${LOCALBASE}/lib -lintl"
23	INSTALL_TARGET= install-bin install-data install-man install-gettext install-doc	25	INSTALL_TARGET= install-bin install-data install-man install-gettext \
		26	install-doc install-gnome
24	MAKE_JOBS_UNSAFE=yes	27	MAKE_JOBS_UNSAFE=yes
25		28
26	OPTIONS_DEFINE= DOCS	29	OPTIONS_DEFINE= DOCS
27		30
28	post-patch:	31	post-extract:
29	@${REINPLACE_CMD} -E 's,(BIN\|DATA\|DOC\|LOCALE\|MAN)_PREFIX),DESTDIR)$$(&,' \	32	@${CHMOD} -R a+rX ${WRKSRC}
30	${WRKSRC}/Makefile
31		33
32	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)games/tuxpaint-config/files/patch-Makefile (-1 / +96 lines)
1	--- Makefile.orig 2009-05-29 07:08:08.000000000 +0900	1	--- Makefile.orig 2009-05-29 07:08:08.000000000 +0900
2	+++ Makefile 2010-10-19 01:39:29.000000000 +0900	2	+++ Makefile 2010-10-19 01:39:29.000000000 +0900
3	@@ -340,7 +340,8 @@	3	@@ -25,19 +25,19 @@
		4
		5	# Program:
		6
		7	-BIN_PREFIX=$(PREFIX)/bin
		8	+BIN_PREFIX=$(DESTDIR)$(PREFIX)/bin
		9	EXE_EXT=
		10
		11
		12	# Data:
		13
		14	-DATA_PREFIX=$(PREFIX)/share/tuxpaint-config/
		15	+DATA_PREFIX=$(DESTDIR)$(PREFIX)/share/tuxpaint-config/
		16
		17
		18	# Docs and man page:
		19
		20	-DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
		21	-MAN_PREFIX=$(PREFIX)/share/man/
		22	+DOC_PREFIX=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-config/
		23	+MAN_PREFIX=$(DESTDIR)$(PREFIX)/man/
		24
		25
		26	# Tux Paint's 'System-wide' Config file:
		27	@@ -45,14 +45,14 @@
		28	ifeq ($(PREFIX),/usr)
		29	CONFDIR=/etc/tuxpaint
		30	else
		31	- CONFDIR=$(PREFIX)/etc/tuxpaint
		32	+ CONFDIR=$(DESTDIR)$(PREFIX)/etc/tuxpaint
		33	endif
		34
		35
		36	# Icons and launchers:
		37
		38	-ICON_PREFIX=$(PREFIX)/share/pixmaps/
		39	-X11_ICON_PREFIX=$(PREFIX)/X11R6/include/X11/pixmaps/
		40	+ICON_PREFIX=$(DESTDIR)$(PREFIX)/share/pixmaps/
		41	+X11_ICON_PREFIX=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps/
		42	GNOME_PREFIX=$(shell gnome-config --prefix 2> /dev/null)
		43	KDE_PREFIX=$(shell kde-config --install apps --expandvars 2> /dev/null)
		44	KDE_ICON_PREFIX=$(shell kde-config --install icon --expandvars 2> /dev/null)
		45	@@ -60,7 +60,7 @@
		46
		47	# Locale files
		48
		49	-LOCALE_PREFIX=$(PREFIX)/share/locale/
		50	+LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/share/locale/
		51	# LOCALE_PREFIX=/usr/share/locale/
		52
		53
		54	@@ -87,9 +87,12 @@
		55	CFLAGS=-O2 -Wall
		56
		57	# The entire set of CFLAGS:
		58	-ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
		59	- -D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
		60	- -DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\" \
		61	+ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) \
		62	+ -DDATA_PREFIX=\"$(patsubst $(DESTDIR)%,%,$(DATA_PREFIX))\" \
		63	+ -D$(NOSOUNDFLAG) \
		64	+ -DDOC_PREFIX=\"$(patsubst $(DESTDIR)%,%,$(DOC_PREFIX))\" \
		65	+ -DLOCALEDIR=\"$(patsubst $(DESTDIR)%,%,$(LOCALE_PREFIX))\" \
		66	+ -DCONFDIR=\"$(patsubst $(DESTDIR)%,%,$(CONFDIR))\" \
		67	-DVER_VERSION=\"$(VER_VERSION)\" -DVER_DATE=\"$(VER_DATE)\"
68
69
70	@@ -203,12 +206,12 @@
71	@echo
72	@echo "...Installing launcher icon into GNOME..."
73	@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
74	- install -d $(GNOME_PREFIX)/share/pixmaps; \
75	- cp data/images/icon.png $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
76	- chmod 644 $(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
77	- install -d $(GNOME_PREFIX)/share/applications; \
78	- cp src/tuxpaint-config.desktop $(GNOME_PREFIX)/share/applications/; \
79	- chmod 644 $(GNOME_PREFIX)/share/applications/tuxpaint-config.desktop; \
80	+ install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
81	+ cp data/images/icon.png $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
82	+ chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
83	+ install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
84	+ cp src/tuxpaint-config.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
85	+ chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint-config.desktop; \
86	fi
87
88
89	@@ -255,7 +258,7 @@
90	install-bin:
91	@echo
92	@echo "...Installing program itself..."
93	- @cp tuxpaint-config $(BIN_PREFIX)
94	+ $(BSD_INSTALL_PROGRAM) tuxpaint-config $(BIN_PREFIX)
95	@chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint-config$(EXE_EXT)
96
97
98	@@ -340,7 +343,8 @@
4	INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))	99	INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))
5		100
6	$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo	101	$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo