CVS commit: pkgsrc/graphics/tuxpaint

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Mar 26 02:32:13 UTC 2020

Modified Files:
        pkgsrc/graphics/tuxpaint: distinfo
        pkgsrc/graphics/tuxpaint/patches: patch-Makefile

Log Message:
Fix portability


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/tuxpaint/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/tuxpaint/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/tuxpaint/distinfo
diff -u pkgsrc/graphics/tuxpaint/distinfo:1.28 pkgsrc/graphics/tuxpaint/distinfo:1.29
--- pkgsrc/graphics/tuxpaint/distinfo:1.28      Sun Sep  2 12:52:02 2018
+++ pkgsrc/graphics/tuxpaint/distinfo   Thu Mar 26 02:32:13 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2018/09/02 12:52:02 wiz Exp $
+$NetBSD: distinfo,v 1.29 2020/03/26 02:32:13 joerg Exp $
 
 SHA1 (tuxpaint-0.9.23.tar.gz) = 7483cd793bc49e1183e870df708d40e697c604b5
 RMD160 (tuxpaint-0.9.23.tar.gz) = 34ef65255fba1418b7c52b21bda0e199867821d5
 SHA512 (tuxpaint-0.9.23.tar.gz) = 540590c401256a2a37d18c77dbc4130d83b015572ac8e9ef03a8c09ea11d2bfbcc8cfcf7e3b221846f6f67d1eaab9b777da15bb0c97561f5cb421e70a8e4615f
 Size (tuxpaint-0.9.23.tar.gz) = 15500449 bytes
-SHA1 (patch-Makefile) = dacc11e6fe2c50aa4d522f50a03b97a006c97790
+SHA1 (patch-Makefile) = 7702fa484c913ed73745c2e23e1d6f09cc6837fb

Index: pkgsrc/graphics/tuxpaint/patches/patch-Makefile
diff -u pkgsrc/graphics/tuxpaint/patches/patch-Makefile:1.3 pkgsrc/graphics/tuxpaint/patches/patch-Makefile:1.4
--- pkgsrc/graphics/tuxpaint/patches/patch-Makefile:1.3 Sun Sep  2 12:52:02 2018
+++ pkgsrc/graphics/tuxpaint/patches/patch-Makefile     Thu Mar 26 02:32:13 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.3 2018/09/02 12:52:02 wiz Exp $
+$NetBSD: patch-Makefile,v 1.4 2020/03/26 02:32:13 joerg Exp $
 
 Do not run KDE4 installation programs.
 
@@ -13,3 +13,30 @@ Do not run KDE4 installation programs.
  ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
  
  # "make install" installs all of the various parts
+@@ -483,7 +483,7 @@ install:   install-bin install-data instal
+       @echo
+       @echo "--------------------------------------------------------------"
+       @echo
+-      @if [ "x$(OS)" == "xosx" ]; then \
++      @if [ "x$(OS)" = "xosx" ]; then \
+               echo "All done! Now you can double click $(BUNDLE) to run the"; \
+               echo "program!!! TuxPaint.dmg has also been created for"; \
+               echo "distribution."; \
+@@ -878,7 +878,7 @@ install-dlls:
+       @cp `which libstdc++-6.dll` $(BIN_PREFIX)
+       @cp `which libfribidi-0.dll` $(BIN_PREFIX)
+       @cp `which libwinpthread-1.dll` $(BIN_PREFIX)
+-      @if [ "x$(BDIST_WIN9X)" == "x" ]; then \
++      @if [ "x$(BDIST_WIN9X)" o= "x" ]; then \
+         cp `which libxml2-2.dll` $(BIN_PREFIX); \
+         cp `which libcairo-2.dll` $(BIN_PREFIX); \
+         cp `which libfontconfig-1.dll` $(BIN_PREFIX); \
+@@ -900,7 +900,7 @@ install-dlls:
+         cp `which bz2-1.dll` $(BIN_PREFIX); \
+       fi
+       @strip -s $(BIN_PREFIX)/*.dll
+-      @if [ "x$(BDIST_WIN9X)" == "x" ]; then \
++      @if [ "x$(BDIST_WIN9X)" = "x" ]; then \
+         echo; \
+         echo "...Installing Configuration Files..."; \
+         cp -R win32/etc/ $(BIN_PREFIX); \