diff -urN /usr/ports/games/tuxpaint-config/Makefile games/tuxpaint-config/Makefile --- /usr/ports/games/tuxpaint-config/Makefile 2014-06-21 17:44:08.000000000 +0900 +++ games/tuxpaint-config/Makefile 2014-09-05 00:00:00.000000000 +0900 @@ -2,31 +2,33 @@ # $FreeBSD: head/games/tuxpaint-config/Makefile 358556 2014-06-20 11:15:57Z amdmi3 $ PORTNAME= tuxpaint-config -PORTVERSION= 0.0.12 -PORTREVISION= 2 +PORTVERSION= 0.0.13 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="${MANPREFIX}/man" \ - X11_ICON_PREFIX="${PREFIX}/share/pixmaps/" \ + 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_TARGET= install-bin install-data install-man install-gettext \ + install-doc install-gnome MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -E 's,(BIN|DATA|DOC|LOCALE|MAN)_PREFIX),DESTDIR)$$(&,' \ - ${WRKSRC}/Makefile +post-extract: + @${CHMOD} -R a+rX ${WRKSRC} .include <bsd.port.mk> diff -urN /usr/ports/games/tuxpaint-config/distinfo games/tuxpaint-config/distinfo --- /usr/ports/games/tuxpaint-config/distinfo 2014-06-21 17:44:08.000000000 +0900 +++ games/tuxpaint-config/distinfo 2014-09-05 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (tuxpaint-config-0.0.12.tar.gz) = 9395a1c92e52c3420cabaa0c781b607e6832b5d9b6180902615f102216e1c8fd -SIZE (tuxpaint-config-0.0.12.tar.gz) = 260444 +SHA256 (tuxpaint-config-0.0.13.tar.gz) = db38058f1e1cc60b15bcaf565118fe41dc9be20435e1b787c607f95d0dd122fc +SIZE (tuxpaint-config-0.0.13.tar.gz) = 451667 diff -urN /usr/ports/games/tuxpaint-config/files/patch-Makefile games/tuxpaint-config/files/patch-Makefile --- /usr/ports/games/tuxpaint-config/files/patch-Makefile 2014-06-21 17:44:08.000000000 +0900 +++ games/tuxpaint-config/files/patch-Makefile 2014-09-05 00:00:00.000000000 +0900 @@ -1,6 +1,101 @@ --- Makefile.orig 2009-05-29 07:08:08.000000000 +0900 +++ Makefile 2010-10-19 01:39:29.000000000 +0900 -@@ -340,7 +340,8 @@ +@@ -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 diff -urN /usr/ports/games/tuxpaint-config/pkg-descr games/tuxpaint-config/pkg-descr --- /usr/ports/games/tuxpaint-config/pkg-descr 2014-06-21 17:44:08.000000000 +0900 +++ games/tuxpaint-config/pkg-descr 2014-09-05 00:00:00.000000000 +0900 @@ -1,7 +1,7 @@ -Tux Paint is a free drawing program designed for young children (kids ages 3 -and up). It has a simple, easy-to-use interface, fun sound effects, and an -encouraging cartoon mascot who helps guide children as they use the program. -It provides a blank canvas and a variety of drawing tools to help your child -be creative. +Tux Paint is a free drawing program designed for young children (kids +ages 3 and up). It has a simple, easy-to-use interface, fun sound +effects, and an encouraging cartoon mascot who helps guide children as +they use the program. It provides a blank canvas and a variety of +drawing tools to help your child be creative. WWW: http://www.tuxpaint.org/ diff -urN /usr/ports/games/tuxpaint-config/pkg-plist games/tuxpaint-config/pkg-plist --- /usr/ports/games/tuxpaint-config/pkg-plist 2014-06-21 17:44:08.000000000 +0900 +++ games/tuxpaint-config/pkg-plist 2014-09-05 00:00:00.000000000 +0900 @@ -1,30 +1,62 @@ bin/tuxpaint-config man/man1/tuxpaint-config.1.gz +share/applications/tuxpaint-config.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/TODO.txt %%PORTDOCS%%%%DOCSDIR%%/html/README.html +share/locale/ach/LC_MESSAGES/tuxpaint-config.mo +share/locale/an/LC_MESSAGES/tuxpaint-config.mo +share/locale/ar/LC_MESSAGES/tuxpaint-config.mo +share/locale/ast/LC_MESSAGES/tuxpaint-config.mo +share/locale/bg/LC_MESSAGES/tuxpaint-config.mo share/locale/ca/LC_MESSAGES/tuxpaint-config.mo +share/locale/cgg/LC_MESSAGES/tuxpaint-config.mo +share/locale/cs/LC_MESSAGES/tuxpaint-config.mo share/locale/da/LC_MESSAGES/tuxpaint-config.mo +share/locale/de/LC_MESSAGES/tuxpaint-config.mo share/locale/el/LC_MESSAGES/tuxpaint-config.mo share/locale/en_GB/LC_MESSAGES/tuxpaint-config.mo +share/locale/eo/LC_MESSAGES/tuxpaint-config.mo share/locale/es/LC_MESSAGES/tuxpaint-config.mo +share/locale/eu/LC_MESSAGES/tuxpaint-config.mo +share/locale/ff/LC_MESSAGES/tuxpaint-config.mo +share/locale/fi/LC_MESSAGES/tuxpaint-config.mo share/locale/fr/LC_MESSAGES/tuxpaint-config.mo +share/locale/gd/LC_MESSAGES/tuxpaint-config.mo +share/locale/hi/LC_MESSAGES/tuxpaint-config.mo +share/locale/hy/LC_MESSAGES/tuxpaint-config.mo +share/locale/id/LC_MESSAGES/tuxpaint-config.mo share/locale/it/LC_MESSAGES/tuxpaint-config.mo +share/locale/iu/LC_MESSAGES/tuxpaint-config.mo share/locale/ja/LC_MESSAGES/tuxpaint-config.mo +share/locale/ka/LC_MESSAGES/tuxpaint-config.mo +share/locale/lv/LC_MESSAGES/tuxpaint-config.mo +share/locale/mn/LC_MESSAGES/tuxpaint-config.mo +share/locale/ms/LC_MESSAGES/tuxpaint-config.mo share/locale/nl/LC_MESSAGES/tuxpaint-config.mo share/locale/nn/LC_MESSAGES/tuxpaint-config.mo +share/locale/pl/LC_MESSAGES/tuxpaint-config.mo +share/locale/pt/LC_MESSAGES/tuxpaint-config.mo share/locale/pt_BR/LC_MESSAGES/tuxpaint-config.mo -share/locale/pt_PT/LC_MESSAGES/tuxpaint-config.mo +share/locale/ro/LC_MESSAGES/tuxpaint-config.mo share/locale/ru/LC_MESSAGES/tuxpaint-config.mo +share/locale/sat/LC_MESSAGES/tuxpaint-config.mo share/locale/sk/LC_MESSAGES/tuxpaint-config.mo share/locale/sl/LC_MESSAGES/tuxpaint-config.mo share/locale/son/LC_MESSAGES/tuxpaint-config.mo +share/locale/sr/LC_MESSAGES/tuxpaint-config.mo +share/locale/sr@latin/LC_MESSAGES/tuxpaint-config.mo share/locale/sv/LC_MESSAGES/tuxpaint-config.mo +share/locale/tr/LC_MESSAGES/tuxpaint-config.mo share/locale/uk/LC_MESSAGES/tuxpaint-config.mo +share/locale/vec/LC_MESSAGES/tuxpaint-config.mo +share/locale/vi/LC_MESSAGES/tuxpaint-config.mo share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo +share/locale/zu/LC_MESSAGES/tuxpaint-config.mo +share/pixmaps/tuxpaint-config.png %%DATADIR%%/images/icon-win32.ico %%DATADIR%%/images/icon.png %%DATADIR%%/images/icon16x16.png