cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to tuxpaint-0.9.25.

Browse Source
This commit is contained in:
ajacoutot 2021-01-09 14:05:40 +00:00
parent 45fb5d73f0
commit 61250e2127
5 changed files with 56 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
games/tuxpaint/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.30 2020/06/07 11:41:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2021/01/09 14:05:40 ajacoutot Exp $
COMMENT= drawing program for children
DISTNAME= tuxpaint-0.9.24
REVISION= 0
DISTNAME= tuxpaint-0.9.25
CATEGORIES= games graphics
@ -15,8 +14,8 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
PERMIT_PACKAGE= Yes
WANTLIB += SDL SDL_Pango SDL_image SDL_mixer SDL_ttf c cairo fribidi
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 intl m
WANTLIB += paper png pthread rsvg-2 z
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 imagequant
WANTLIB += intl m paper png pthread rsvg-2 z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
@ -29,6 +28,7 @@ LIB_DEPENDS= devel/sdl-image \
devel/sdl-mixer \
devel/sdl-ttf \
devel/sdl-pango \
graphics/libimagequant \
print/libpaper \
x11/gnome/librsvg

4
games/tuxpaint/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tuxpaint-0.9.24.tar.gz) = h2JXL1XzNaqmMpEGKCvr8XHnMF95b6e1qtPNeMWjoRo=
SIZE (tuxpaint-0.9.24.tar.gz) = 15561675
SHA256 (tuxpaint-0.9.25.tar.gz) = wRhbe6l3Aa5IY5rePlVIi9aVqRmntbOPWyqw35O24Z0=
SIZE (tuxpaint-0.9.25.tar.gz) = 15751899

56
games/tuxpaint/patches/patch-Makefile
View File

@ -1,27 +1,27 @@
$OpenBSD: patch-Makefile,v 1.11 2020/06/07 11:41:05 ajacoutot Exp $
$OpenBSD: patch-Makefile,v 1.12 2021/01/09 14:05:40 ajacoutot Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -41,7 +41,7 @@ else
@@ -52,7 +52,7 @@ else
endif
else
OS:=linux
- GPERF:=/usr/bin/gperf
+ GPERF:=${LOCALBASE}/bin/gperf
endif
else
OS:=linux
- GPERF:=/usr/bin/gperf
+ GPERF:=${LOCALBASE}/bin/gperf
endif
endif
endif
@@ -98,7 +98,7 @@ ARCH_LIBS:=$($(OS)_ARCH_LIBS)
@@ -110,7 +110,7 @@ ARCH_LIBS:=$($(OS)_ARCH_LIBS)
windows_ARCH_CFLAGS:=
osx_ARCH_CFLAGS:=-mmacosx-version-min=10.8 -isystem /opt/local/include -DHAVE_STRCASESTR -w -headerpad_max_install_names
macos_ARCH_CFLAGS:=-mmacosx-version-min=10.8 -isystem /opt/local/include -DHAVE_STRCASESTR -w -headerpad_max_install_names
beos_ARCH_CFLAGS:=
-linux_ARCH_CFLAGS:=
+#linux_ARCH_CFLAGS:=
ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
windows_ARCH_LDFLAGS:=
@@ -108,9 +108,8 @@ linux_ARCH_LDFLAGS:=
@@ -120,9 +120,8 @@ linux_ARCH_LDFLAGS:=
ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
LDFLAGS:=$(ARCH_LDFLAGS)
@ -33,16 +33,16 @@ Index: Makefile
FRIBIDI_LIB:=$(shell $(PKG_CONFIG) --libs fribidi)
FRIBIDI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags fribidi)
@@ -132,7 +131,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
@@ -144,7 +143,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
windows_PREFIX:=/usr/local
osx_PREFIX:=Resources
macos_PREFIX:=Resources
linux_PREFIX:=/usr/local
-PREFIX:=$($(OS)_PREFIX)
+PREFIX:=${TRUEPREFIX}
# Root directory to place files when creating packages.
# PKG_ROOT is the old name for this, and should be undefined.
@@ -166,19 +165,19 @@ INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
@@ -178,19 +177,19 @@ INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
# Docs and man page:
@ -67,7 +67,7 @@ Index: Makefile
endif
ifeq ($(SYSNAME),Haiku)
@@ -646,18 +645,16 @@ uninstall: uninstall-i18n
@@ -658,18 +657,16 @@ uninstall: uninstall-i18n
install-default-config:
@echo
@echo "...Installing default config file..."
@ -90,7 +90,7 @@ Index: Makefile
# Install example stamps
@@ -665,7 +662,7 @@ install-bash-completion:
@@ -677,7 +674,7 @@ install-bash-completion:
install-example-stamps:
@echo
@echo "...Installing example stamps..."
@ -99,19 +99,19 @@ Index: Makefile
@cp -R stamps/* $(DATA_PREFIX)/stamps
@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)/stamps
@@ -715,7 +712,10 @@ $(THUMB_STARTERS):
@@ -727,7 +724,10 @@ $(THUMB_STARTERS):
fi
$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: %
- @install -D -m 644 $< $@
- @install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
+ @cd starters ; \
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(PREFIX)/share/tuxpaint/starters ; \
+ for i in `ls *.*` ; do \
+ ${BSD_INSTALL_DATA} $$i $(DESTDIR)$(PREFIX)/share/tuxpaint/starters ; done
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(PREFIX)/share/tuxpaint/starters ; \
+ for i in `ls *.*` ; do \
+ ${BSD_INSTALL_DATA} $$i $(DESTDIR)$(PREFIX)/share/tuxpaint/starters ; done
.PHONY: echo-thumb-starters
echo-thumb-starters:
@@ -822,24 +822,22 @@ install-nokia770:
@@ -834,24 +834,22 @@ install-nokia770:
install-xdg:
@echo
@echo "...Installing launcher icon into desktop environment..."
@ -152,7 +152,7 @@ Index: Makefile
# Install the PNG icon (for KDE desktop, etc.)
# and the 24-color 32x32 XPM (for other Window managers):
@@ -847,12 +845,9 @@ install-xdg:
@@ -859,12 +857,9 @@ install-xdg:
install-icon:
@echo
@echo "...Installing launcher icon graphics..."
@ -168,7 +168,7 @@ Index: Makefile
# Install the program:
@@ -860,9 +855,8 @@ install-icon:
@@ -872,9 +867,8 @@ install-icon:
install-bin:
@echo
@echo "...Installing program itself..."
@ -178,9 +178,9 @@ Index: Makefile
+ ${BSD_INSTALL_DATA_DIR} $(BIN_PREFIX)
+ ${BSD_INSTALL_PROGRAM} tuxpaint $(BIN_PREFIX)
# Install the required Windows DLLs into the 'bdist' directory
# Install tuxpaint-config and required Windows DLLs into the 'bdist' directory
.PHONY: install-dlls
@@ -939,8 +933,7 @@ install-haiku:
@@ -949,8 +943,7 @@ install-haiku:
install-importscript:
@echo
@echo "...Installing 'tuxpaint-import' script..."
@ -190,7 +190,7 @@ Index: Makefile
# Install the data (sound, graphics, fonts):
@@ -948,12 +941,14 @@ install-importscript:
@@ -958,12 +951,14 @@ install-importscript:
install-data:
@echo
@echo "...Installing data files..."
@ -207,7 +207,7 @@ Index: Makefile
@cp -R fonts/locale/* $(DATA_PREFIX)/fonts/locale
@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)/fonts/locale
@@ -973,7 +968,7 @@ install-osk:
@@ -983,7 +978,7 @@ install-osk:
install-doc:
@echo
@echo "...Installing documentation..."
@ -216,7 +216,7 @@ Index: Makefile
@cp -R docs/* $(DOC_PREFIX)
@# FIXME: Needs improvement, when we add other translations -bjk 2018.08.30
@install -d $(DOC_PREFIX)/en/magic-docs
@@ -987,25 +982,13 @@ install-man:
@@ -997,25 +992,13 @@ install-man:
@echo
@echo "...Installing man pages..."
@# man1 directory...

8
games/tuxpaint/patches/patch-src_manpage_tuxpaint_1
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_manpage_tuxpaint_1,v 1.7 2020/06/06 10:13:29 ajacoutot Exp $
$OpenBSD: patch-src_manpage_tuxpaint_1,v 1.8 2021/01/09 14:05:40 ajacoutot Exp $
Index: src/manpage/tuxpaint.1
--- src/manpage/tuxpaint.1.orig
+++ src/manpage/tuxpaint.1
@@ -940,7 +940,7 @@ Display a lists of all supported languages.
@@ -953,7 +953,7 @@ Display a lists of all supported languages.
.TP 8
.B \-\-nosysconfig
With this option, \fITux Paint\fP will not attempt to read the
@ -12,7 +12,7 @@ Index: src/manpage/tuxpaint.1
.TP 8
.B \-\-nolockfile
@@ -968,7 +968,7 @@ to determine language to use, if \fIsetlocale(3)\fP re
@@ -981,7 +981,7 @@ to determine language to use, if \fIsetlocale(3)\fP re
.SH FILES
.TP 8
@ -21,7 +21,7 @@ Index: src/manpage/tuxpaint.1
System-wide configuration file. It is read first
(unless the \fI\-\-nosysconfig\fP option was given on the command-line).
.RS
@@ -1231,4 +1231,4 @@ Huang Zuzhen.
@@ -1245,4 +1245,4 @@ Huang Zuzhen.
.BR krita (1),
.BR gcompris (1)
.PP

18
games/tuxpaint/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2020/06/07 11:41:05 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.12 2021/01/09 14:05:40 ajacoutot Exp $
bin/tp-magic-config
@bin bin/tuxpaint
bin/tuxpaint-import
@ -364,8 +364,10 @@ share/doc/tuxpaint/html/images/icon-win32.png
share/doc/tuxpaint/html/images/open_back.png
share/doc/tuxpaint/html/images/open_dialog.jpg
share/doc/tuxpaint/html/images/open_erase.png
share/doc/tuxpaint/html/images/open_export.png
share/doc/tuxpaint/html/images/open_open.png
share/doc/tuxpaint/html/images/open_slides.png
share/doc/tuxpaint/html/images/open_slides_export_gif.png
share/doc/tuxpaint/html/images/saveover.png
share/doc/tuxpaint/html/images/selector.jpg
share/doc/tuxpaint/html/images/stamp_edit.png
@ -630,6 +632,9 @@ share/locale/sat/LC_MESSAGES/tuxpaint.mo
share/locale/sat@olchiki/
share/locale/sat@olchiki/LC_MESSAGES/
share/locale/sat@olchiki/LC_MESSAGES/tuxpaint.mo
share/locale/sc/
share/locale/sc/LC_MESSAGES/
share/locale/sc/LC_MESSAGES/tuxpaint.mo
share/locale/sd/
share/locale/sd/LC_MESSAGES/
share/locale/sd/LC_MESSAGES/tuxpaint.mo
@ -718,6 +723,12 @@ share/tuxpaint/brushes/flower_5_small.png
share/tuxpaint/brushes/flower_6.png
share/tuxpaint/brushes/flower_6_small.png
share/tuxpaint/brushes/flower_7.png
share/tuxpaint/brushes/footprints-human-shoes.dat
share/tuxpaint/brushes/footprints-human-shoes.png
share/tuxpaint/brushes/footprints-human.dat
share/tuxpaint/brushes/footprints-human.png
share/tuxpaint/brushes/footprints-paws.dat
share/tuxpaint/brushes/footprints-paws.png
share/tuxpaint/brushes/heart.png
share/tuxpaint/brushes/hexagon.png
share/tuxpaint/brushes/inksplat.dat
@ -999,6 +1010,7 @@ share/tuxpaint/images/ui/
share/tuxpaint/images/ui/back.png
share/tuxpaint/images/ui/bold.png
share/tuxpaint/images/ui/btn_down.png
share/tuxpaint/images/ui/btn_hold.png
share/tuxpaint/images/ui/btn_nav.png
share/tuxpaint/images/ui/btn_off.png
share/tuxpaint/images/ui/btn_up.png
@ -1020,6 +1032,7 @@ share/tuxpaint/images/ui/cursor_up_large.png
share/tuxpaint/images/ui/dead40x40.png
share/tuxpaint/images/ui/erase.png
share/tuxpaint/images/ui/flip.png
share/tuxpaint/images/ui/gif_export.png
share/tuxpaint/images/ui/grow.png
share/tuxpaint/images/ui/italic.png
share/tuxpaint/images/ui/magic_fullscreen.png
@ -1039,6 +1052,7 @@ share/tuxpaint/images/ui/osk_shift.png
share/tuxpaint/images/ui/osk_tab.png
share/tuxpaint/images/ui/paintcan.png
share/tuxpaint/images/ui/paintwell.png
share/tuxpaint/images/ui/pict_export.png
share/tuxpaint/images/ui/play.png
share/tuxpaint/images/ui/popup_arrow.png
share/tuxpaint/images/ui/prev.png
@ -1051,6 +1065,8 @@ share/tuxpaint/images/ui/scroll_down_off.png
share/tuxpaint/images/ui/scroll_up.png
share/tuxpaint/images/ui/scroll_up_off.png
share/tuxpaint/images/ui/select_digits.png
share/tuxpaint/images/ui/shapes_center.png
share/tuxpaint/images/ui/shapes_corner.png
share/tuxpaint/images/ui/shrink.png
share/tuxpaint/images/ui/slideshow.png
share/tuxpaint/images/ui/sparkles-old.png