Attachment 147076 Details for Bug 193324 – games_tuxpaint-config.diff

[patch] games_tuxpaint-config.diff

games_tuxpaint-config.diff (text/plain), 11.45 KB, created by tkato432 on 2014-09-08 18:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-09-08 18:30:09 UTC

Size: 11.45 KB

patch

obsolete

>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-09 03:00:00.000000000 +0900
>@@ -2,14 +2,15 @@
> # $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
>@@ -17,16 +18,19 @@
> USES=		gettext gmake
> MAKE_ARGS=	PREFIX="${PREFIX}" \
> 		MAN_PREFIX="${MANPREFIX}/man" \
>-		X11_ICON_PREFIX="${PREFIX}/share/pixmaps/" \
>-		CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
>-		ARCH_LINKS="-L${LOCALBASE}/lib -lintl"
>-INSTALL_TARGET=	install-bin install-data install-man install-gettext install-doc
>+		GNOME_PREFIX="${PREFIX}" \
>+		CFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
>+		ARCH_LINKS="${LDFLAGS}"
>+INSTALL_TARGET=	install-bin install-data install-man install-gettext \
>+		install-doc install-gnome
> MAKE_JOBS_UNSAFE=yes
> 
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
>+
> 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-09 03: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-09 03:00:00.000000000 +0900
>@@ -1,10 +1,124 @@
> --- Makefile.orig	2009-05-29 07:08:08.000000000 +0900
> +++ Makefile	2010-10-19 01:39:29.000000000 +0900
>-@@ -340,7 +340,8 @@
>- INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))
>+@@ -203,12 +203,10 @@
>+ 	@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; \
>++	  $(BSD_INSTALL_DATA) data/images/icon.png $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint-config.png; \
>++	  install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
>++	  $(BSD_INSTALL_DATA) src/tuxpaint-config.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
>+ 	fi
>  
>- $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo
>+ 
>+@@ -218,9 +216,8 @@
>+ 	@echo
>+ 	@echo "...Installing launcher icon into KDE..."
>+ 	@if [ "x$(KDE_PREFIX)" != "x" ]; then \
>+-	  install -d $(KDE_PREFIX)/Preferences/; \
>+-	  cp src/tuxpaint-config.desktop $(KDE_PREFIX)/Preferences/; \
>+-	  chmod 644 $(KDE_PREFIX)/Preferences/tuxpaint-config.desktop; \
>++	  install -d $(DESTDIR)$(KDE_PREFIX)/Preferences/; \
>++	  $(BSD_INSTALL_DATA) src/tuxpaint-config.desktop $(DESTDIR)$(KDE_PREFIX)/Preferences/; \
>+ 	fi
>+ 
>+ 
>+@@ -242,12 +239,10 @@
>+ install-icon:
>+ 	@echo
>+ 	@echo "...Installing launcher icon graphics..."
>+-	@install -d $(ICON_PREFIX)
>+-	@cp data/images/icon.png $(ICON_PREFIX)tuxpaint-config.png
>+-	@chmod 644 $(ICON_PREFIX)tuxpaint-config.png
>+-	@install -d $(X11_ICON_PREFIX)
>+-	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)tuxpaint-config.xpm
>+-	@chmod 644 $(X11_ICON_PREFIX)tuxpaint-config.xpm
>++	@install -d $(DESTDIR)$(ICON_PREFIX)
>++	$(BSD_INSTALL_DATA) data/images/icon.png $(DESTDIR)$(ICON_PREFIX)tuxpaint-config.png
>++	@install -d $(DESTDIR)$(X11_ICON_PREFIX)
>++	$(BSD_INSTALL_DATA) data/images/icon32x32.xpm $(DESTDIR)$(X11_ICON_PREFIX)tuxpaint-config.xpm
>+ 
>+ 
>+ # Install the program:
>+@@ -255,8 +250,7 @@
>+ 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 $(DESTDIR)$(BIN_PREFIX)
>+ 
>+ 
>+ # Install the data (sound, graphics, fonts):
>+@@ -264,9 +258,9 @@
>+ install-data:
>+ 	@echo
>+ 	@echo "...Installing data files..."
>+-	@install -d $(DATA_PREFIX)
>+-	@cp -R data/* $(DATA_PREFIX)
>+-	@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
>++	@install -d $(DESTDIR)$(DATA_PREFIX)
>++	@install -d $(DESTDIR)$(DATA_PREFIX)/images
>++	$(BSD_INSTALL_DATA) data/images/* $(DESTDIR)$(DATA_PREFIX)/images
>+ 
>+ 
>+ # Install the text documentation:
>+@@ -275,16 +269,14 @@
>+ 	@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)
>++	@install -d $(DESTDIR)$(DOC_PREFIX)
>++	@install -d $(DESTDIR)$(DOC_PREFIX)/html
>++	$(BSD_INSTALL_DATA) docs/AUTHORS.txt $(DESTDIR)$(DOC_PREFIX)
>++	$(BSD_INSTALL_DATA) docs/CHANGES.txt $(DESTDIR)$(DOC_PREFIX)
>++	$(BSD_INSTALL_DATA) docs/COPYING.txt $(DESTDIR)$(DOC_PREFIX)
>++	$(BSD_INSTALL_DATA) docs/README.txt $(DESTDIR)$(DOC_PREFIX)
>++	$(BSD_INSTALL_DATA) docs/html/README.html $(DESTDIR)$(DOC_PREFIX)/html
>++	$(BSD_INSTALL_DATA) docs/TODO.txt $(DESTDIR)$(DOC_PREFIX)
>+ 
>+ 
>+ # Install the man page:
>+@@ -292,11 +284,10 @@
>+ install-man:
>+ 	@echo "...Installing man pages..."
>+ 	# man1 directory...
>+-	@install -d $(MAN_PREFIX)/man1/
>++	@install -d $(DESTDIR)$(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 $(DESTDIR)$(MAN_PREFIX)/man1/
>++	@gzip -9f $(DESTDIR)$(MAN_PREFIX)/man1/tuxpaint-config.1
>+ 
>+ 
>+ # Build the program!
>+@@ -337,10 +328,11 @@
>+ 
>+ 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_MOFILES:=$(patsubst trans/%.mo,$(DESTDIR)$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))
>+ 
>+-$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo
> -	install -D -m 644 $< $@
>++$(INSTALLED_MOFILES): $(DESTDIR)$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo
> +	test -d `dirname $@` || mkdir -p `dirname $@`
> +	$(BSD_INSTALL_DATA) $< $@
>  
>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-09 03: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-09 03: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

Actions: View | Diff

Attachments on bug 193324: 146823 | 146963 | 147076