CVS commit: pkgsrc/print/ghostscript-agpl

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sat Jan 22 13:51:55 UTC 2022

Modified Files:
        pkgsrc/print/ghostscript-agpl: Makefile distinfo
        pkgsrc/print/ghostscript-agpl/patches: patch-base_unix-dll.mak

Log Message:
ghostscript-agpl: Fix build issue discussed on pkgsrc-users@

https://mail-index.netbsd.org/pkgsrc-users/2019/06/13/msg028790.html

This fix has kindly been provided upstream to try solving the building
errors (https://bugs.ghostscript.com/show_bug.cgi?id=704844).


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/print/ghostscript-agpl/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/print/ghostscript-agpl/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak

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

Modified files:

Index: pkgsrc/print/ghostscript-agpl/Makefile
diff -u pkgsrc/print/ghostscript-agpl/Makefile:1.64 pkgsrc/print/ghostscript-agpl/Makefile:1.65
--- pkgsrc/print/ghostscript-agpl/Makefile:1.64 Wed Dec  8 16:06:13 2021
+++ pkgsrc/print/ghostscript-agpl/Makefile      Sat Jan 22 13:51:55 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2021/12/08 16:06:13 adam Exp $
+# $NetBSD: Makefile,v 1.65 2022/01/22 13:51:55 triaxx Exp $
 
 DISTNAME=      ghostscript-${GS_VERSION}
 PKGNAME=       ${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ArtifexSoftware/}
 GITHUB_PROJECT=        ghostpdl-downloads
@@ -51,8 +51,7 @@ MESSAGE_SUBST+=               GS_RESOURCEDIR=${GS_RES
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-# \todo Remove "a4" as that is not valid according to pkglint.
-.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
+.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
 BUILD_DEFS+=           PAPERSIZE
 CFLAGS+=               -DA4
 .endif

Index: pkgsrc/print/ghostscript-agpl/distinfo
diff -u pkgsrc/print/ghostscript-agpl/distinfo:1.39 pkgsrc/print/ghostscript-agpl/distinfo:1.40
--- pkgsrc/print/ghostscript-agpl/distinfo:1.39 Tue Oct 26 11:12:06 2021
+++ pkgsrc/print/ghostscript-agpl/distinfo      Sat Jan 22 13:51:55 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 11:12:06 nia Exp $
+$NetBSD: distinfo,v 1.40 2022/01/22 13:51:55 triaxx Exp $
 
 BLAKE2s (ghostscript-9.55.0.tar.xz) = eabebbf89b7151c8ef41fae5aca3f3d67229f61f4bc8a06b0f574c05e63c6e84
 SHA512 (ghostscript-9.55.0.tar.xz) = 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
@@ -8,6 +8,6 @@ SHA1 (patch-base_gsicc__lcms2.c) = 23f5f
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0
 SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688
-SHA1 (patch-base_unix-dll.mak) = 73b5ee7fcbc7940ce72f44b35417d624f7ae5bca
+SHA1 (patch-base_unix-dll.mak) = 14627bbef4426f9fe73babefd1f860df3472ed22
 SHA1 (patch-configure) = f3f2583ef56a01f4107fec75057b7fc1be519c39
 SHA1 (patch-devices_devs.mak) = e9937d401a278cc6d0a6d4cff78c526375bc18ca

Index: pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak
diff -u pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.4 pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.5
--- pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.4   Wed Sep  5 13:19:40 2018
+++ pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak       Sat Jan 22 13:51:55 2022
@@ -1,11 +1,13 @@
-$NetBSD: patch-base_unix-dll.mak,v 1.4 2018/09/05 13:19:40 adam Exp $
+$NetBSD: patch-base_unix-dll.mak,v 1.5 2022/01/22 13:51:55 triaxx Exp $
 
-Use correct shared library naming on Darwin.
-Add some rpaths.
+* Use correct shared library naming on Darwin.
+* Add some rpaths.
+* A build issue has been discussed on pkgsrc-users@ (https://mail-index.netbsd.org/pkgsrc-users/2019/06/13/msg028790.html)
+  A fix has been provided upstream (https://bugs.ghostscript.com/show_bug.cgi?id=704844)
 
---- base/unix-dll.mak.orig     2018-09-03 08:50:27.000000000 +0000
+--- base/unix-dll.mak.orig     2021-09-27 07:44:02.000000000 +0000
 +++ base/unix-dll.mak
-@@ -91,10 +91,10 @@ GPDL_SONAME_MAJOR_MINOR=$(GPDL_SONAME_BA
+@@ -100,10 +100,10 @@ GS_DLLEXT=$(DLL_EXT)
  
  
  # MacOS X
@@ -20,16 +22,24 @@ Add some rpaths.
  #LDFLAGS_SO=-dynamiclib -flat_namespace
  #LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
  #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
-@@ -171,11 +171,11 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UN
+@@ -193,13 +193,16 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UN
+       $(NO_OP)
+ 
  # Build the small Ghostscript loaders, with Gtk+ and without
- $(GSSOC_XE): gs-so-links-subtarget $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
+-$(GSSOC_XE): gs-so-links-subtarget $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
++$(GLOBJ)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
        $(GLCC) $(GLO_)dxmainc.$(OBJ) $(C_) $(PSSRC)dxmainc.c
 -      $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)
-+      $(GLCC) -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)
  
- $(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
-       $(GLCC) $(SOC_CFLAGS) $(GLO_)$(SOC_LOADER).$(OBJ) $(C_) $(PSSRC)$(SOC_LOADER).c
+-$(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
+-      $(GLCC) $(SOC_CFLAGS) $(GLO_)$(SOC_LOADER).$(OBJ) $(C_) $(PSSRC)$(SOC_LOADER).c
 -      $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS)
++$(GSSOC_XE): gs-so-links-subtarget $(GLOBJ)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
++      $(GLCC) -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)
++
++$(GLO_)$(SOC_LOADER).$(OBJ): $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
++
++$(GSSOX_XE): gs-so-links-subtarget $(GLO_)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
 +      $(GLCC) -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS)
  
  $(PCLSOC_XE): gpcl6-so-links-subtarget $(UNIX_DLL_MAK) $(PLOBJ)$(REALMAIN_SRC).$(OBJ) $(MAKEDIRS)