CVS commit: pkgsrc/print/ghostscript-agpl

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Mar 17 16:38:49 UTC 2019

Modified Files:
        pkgsrc/print/ghostscript-agpl: Makefile buildlink3.mk

Log Message:
ghostscript-agpl: Switch to use pkgsrc openjpeg instead of bundled one

Remove bundled openjpeg in WRKSRC, add a dependency to openjpeg and pass
`--enable-openjpeg' in order to always link to pkgsrc one instead of the
ghostscript bundled one.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/ghostscript-agpl/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/ghostscript-agpl/buildlink3.mk

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.36 pkgsrc/print/ghostscript-agpl/Makefile:1.37
--- pkgsrc/print/ghostscript-agpl/Makefile:1.36 Sun Mar 17 16:03:56 2019
+++ pkgsrc/print/ghostscript-agpl/Makefile      Sun Mar 17 16:38:49 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2019/03/17 16:03:56 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2019/03/17 16:38:49 leot 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
@@ -22,6 +22,7 @@ DEPENDS+=             ghostscript-fonts>=6.0:../../
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake perl:run lex pkg-config
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --enable-openjpeg
 CONFIGURE_ARGS+=       --with-system-libtiff
 CONFIGURE_ENV+=                LPLIBDIR=${PREFIX}/lib
 CONFIGURE_ENV.HPUX+=   ac_cv_func_fopen64=no
@@ -87,6 +88,7 @@ post-extract:
        ${RM} -rf ${WRKSRC}/jpeg
        ${RM} -rf ${WRKSRC}/lcms2
        ${RM} -rf ${WRKSRC}/libpng
+       ${RM} -rf ${WRKSRC}/openjpeg
        ${RM} -rf ${WRKSRC}/tiff
        ${RM} -rf ${WRKSRC}/zlib
 
@@ -104,8 +106,7 @@ post-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbig2dec/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
-# \todo Explain why this is present and commented out.
-#.include "../../graphics/openjpeg15/buildlink3.mk"
+.include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"

Index: pkgsrc/print/ghostscript-agpl/buildlink3.mk
diff -u pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.10 pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.11
--- pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.10    Mon Mar 12 11:15:42 2018
+++ pkgsrc/print/ghostscript-agpl/buildlink3.mk Sun Mar 17 16:38:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/03/12 11:15:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2019/03/17 16:38:49 leot Exp $
 
 BUILDLINK_TREE+=       ghostscript-agpl
 
@@ -9,6 +9,7 @@ BUILDLINK_API_DEPENDS.ghostscript-agpl+=
 BUILDLINK_ABI_DEPENDS.ghostscript-agpl+=       ghostscript-agpl>=9.22nb2
 BUILDLINK_PKGSRCDIR.ghostscript-agpl?=         ../../print/ghostscript-agpl
 
+.include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"