Wed Sep 12 15:03:20 2018 UTC ()
gutenprint-lib: drop include of gexiv2 bl3

gutenprint had a workaruond because something it included added
-lgexiv2 to the link link (via libtool) without having it in bl3.
That's fixed, so drop the workaround.


(gdt)
diff -r1.82 -r1.83 pkgsrc/print/gutenprint-lib/Makefile
cvs diff -r1.82 -r1.83 pkgsrc/print/gutenprint-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/print/gutenprint-lib/Makefile 2018/09/10 15:41:33 1.82
+++ pkgsrc/print/gutenprint-lib/Makefile 2018/09/12 15:03:20 1.83
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.82 2018/09/10 15:41:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.83 2018/09/12 15:03:20 gdt Exp $
2 2
3VERSION= 5.2.14 3VERSION= 5.2.14
4DISTNAME= gutenprint-${VERSION} 4DISTNAME= gutenprint-${VERSION}
5PKGNAME= gutenprint-lib-${VERSION} 5PKGNAME= gutenprint-lib-${VERSION}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= print 7CATEGORIES= print
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= gdt@NetBSD.org 11MAINTAINER= gdt@NetBSD.org
12COMMENT= Drivers for Canon, Epson, Lexmark, and PCL printers 12COMMENT= Drivers for Canon, Epson, Lexmark, and PCL printers
13HOMEPAGE= http://gutenprint.sourceforge.net/ 13HOMEPAGE= http://gutenprint.sourceforge.net/
14 14
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17PREV_PKGPATH= print/gutenprint51-lib 17PREV_PKGPATH= print/gutenprint51-lib
18 18
19INSTALLVERSION= 5.2 19INSTALLVERSION= 5.2
@@ -87,20 +87,18 @@ CONFIGURE_ARGS+= --without-readline @@ -87,20 +87,18 @@ CONFIGURE_ARGS+= --without-readline
87 87
88# XXX Make command.types be a CONF_FILE 88# XXX Make command.types be a CONF_FILE
89 89
90# XXX Replace patch-aa with SUBST_SED to use PREFIX rather than hard-coded /usr/pkg. 90# XXX Replace patch-aa with SUBST_SED to use PREFIX rather than hard-coded /usr/pkg.
91 91
92TEST_TARGET= check 92TEST_TARGET= check
93 93
94# A libintl is optional in gutenprint. 94# A libintl is optional in gutenprint.
95.include "../../devel/gettext-lib/buildlink3.mk" 95.include "../../devel/gettext-lib/buildlink3.mk"
96 96
97# gutenprint-gimp: gimp plugin 97# gutenprint-gimp: gimp plugin
98.include "../../graphics/gimp/buildlink3.mk" 98.include "../../graphics/gimp/buildlink3.mk"
99.include "../../x11/gtk2/buildlink3.mk" 99.include "../../x11/gtk2/buildlink3.mk"
100# gutenprint does not actually depend on gexiv2; it is wrongly inserted by libtool 
101.include "../../graphics/gexiv2/buildlink3.mk" 
102 100
103# gutenprint-cups: cups support 101# gutenprint-cups: cups support
104.include "../../print/cups-base/buildlink3.mk" 102.include "../../print/cups-base/buildlink3.mk"
105 103
106.include "../../mk/bsd.pkg.mk" 104.include "../../mk/bsd.pkg.mk"