Thu Jan 10 15:23:27 2008 UTC ()
-make fontconfig an option, on per default (as is x11)
-add pkg-config to TOOLS (used to locate fontconfig)


(drochner)
diff -r1.41 -r1.42 pkgsrc/print/ghostscript/Makefile
diff -r1.4 -r1.5 pkgsrc/print/ghostscript/options.mk
cvs diff -r1.41 -r1.42 pkgsrc/print/ghostscript/Makefile (expand / switch to unified diff)

--- pkgsrc/print/ghostscript/Makefile 2008/01/10 09:09:02 1.41
+++ pkgsrc/print/ghostscript/Makefile 2008/01/10 15:23:27 1.42
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.41 2008/01/10 09:09:02 tron Exp $ 1# $NetBSD: Makefile,v 1.42 2008/01/10 15:23:27 drochner Exp $
2 2
3DISTNAME= ghostscript-8.61 3DISTNAME= ghostscript-8.61
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ghostscript.sourceforge.net/ 10HOMEPAGE= http://ghostscript.sourceforge.net/
11COMMENT= Postscript interpreter 11COMMENT= Postscript interpreter
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15CONFLICTS+= ghostscript-afpl-[0-9]* 15CONFLICTS+= ghostscript-afpl-[0-9]*
16CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]* 16CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]*
17CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]* 17CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
18 18
19DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts 19DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
20 20
21USE_TOOLS+= gmake perl:run lex 21USE_TOOLS+= gmake perl:run lex pkg-config
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23MAKE_JOBS_SAFE= no 23MAKE_JOBS_SAFE= no
24 24
25REPLACE_PERL+= lib/fixmswrd.pl 25REPLACE_PERL+= lib/fixmswrd.pl
26 26
27GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/Resource 27GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/Resource
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4") 31.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
32CFLAGS+= -DA4 32CFLAGS+= -DA4
33.endif 33.endif
34 34
@@ -45,17 +45,16 @@ CONFIGURE_ENV+= ac_cv_func_fopen64=no @@ -45,17 +45,16 @@ CONFIGURE_ENV+= ac_cv_func_fopen64=no
45.endif 45.endif
46 46
47post-extract: 47post-extract:
48 ${MKDIR} ${WRKSRC}/bin 48 ${MKDIR} ${WRKSRC}/bin
49 ${MKDIR} ${WRKSRC}/obj 49 ${MKDIR} ${WRKSRC}/obj
50# ${MV} ${WRKSRC}/jasper ${WRKSRC}/jasper.dontuse 50# ${MV} ${WRKSRC}/jasper ${WRKSRC}/jasper.dontuse
51 ${MV} ${WRKSRC}/libpng ${WRKSRC}/libpng.dontuse 51 ${MV} ${WRKSRC}/libpng ${WRKSRC}/libpng.dontuse
52# ${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib.dontuse 52# ${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib.dontuse
53 53
54.include "options.mk" 54.include "options.mk"
55 55
56.include "../../graphics/png/buildlink3.mk" 56.include "../../graphics/png/buildlink3.mk"
57.include "../../devel/zlib/buildlink3.mk" 57.include "../../devel/zlib/buildlink3.mk"
58.include "../../fonts/fontconfig/buildlink3.mk" 
59# pkgsrc jasper is too new 58# pkgsrc jasper is too new
60#.include "../../graphics/jasper/buildlink3.mk" 59#.include "../../graphics/jasper/buildlink3.mk"
61.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/print/ghostscript/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/print/ghostscript/Attic/options.mk 2007/10/22 12:35:32 1.4
+++ pkgsrc/print/ghostscript/Attic/options.mk 2008/01/10 15:23:27 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.4 2007/10/22 12:35:32 dsainty Exp $ 1# $NetBSD: options.mk,v 1.5 2008/01/10 15:23:27 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript 3PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript
4PKG_SUPPORTED_OPTIONS= x11 cups 4PKG_SUPPORTED_OPTIONS= x11 cups fontconfig
5PKG_SUGGESTED_OPTIONS= x11 5PKG_SUGGESTED_OPTIONS= x11 fontconfig
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mx11) 9.if !empty(PKG_OPTIONS:Mx11)
10CONFIGURE_ARGS+= --with-x 10CONFIGURE_ARGS+= --with-x
11.include "../../x11/libX11/buildlink3.mk" 11.include "../../x11/libX11/buildlink3.mk"
12.include "../../x11/libXt/buildlink3.mk" 12.include "../../x11/libXt/buildlink3.mk"
13.include "../../x11/libXext/buildlink3.mk" 13.include "../../x11/libXext/buildlink3.mk"
14.else 14.else
15CONFIGURE_ARGS+= --without-x 15CONFIGURE_ARGS+= --without-x
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mcups) 18.if !empty(PKG_OPTIONS:Mcups)
@@ -24,13 +24,19 @@ CUPS_EGDIR= ${PREFIX}/share/examples/cup @@ -24,13 +24,19 @@ CUPS_EGDIR= ${PREFIX}/share/examples/cup
24CONF_FILES+= ${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs 24CONF_FILES+= ${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
25 25
26SUBST_CLASSES+= cupsetc 26SUBST_CLASSES+= cupsetc
27SUBST_STAGE.cupsetc= post-extract 27SUBST_STAGE.cupsetc= post-extract
28SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example 28SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example
29SUBST_FILES.cupsetc= cups/cups.mak 29SUBST_FILES.cupsetc= cups/cups.mak
30SUBST_SED.cupsetc= -e "s|^CUPSCONFIG=.*|CUPSCONFIG=${CUPS_EGDIR}|g" 30SUBST_SED.cupsetc= -e "s|^CUPSCONFIG=.*|CUPSCONFIG=${CUPS_EGDIR}|g"
31 31
32.include "../../print/cups/buildlink3.mk" 32.include "../../print/cups/buildlink3.mk"
33.else 33.else
34CONFIGURE_ARGS+= --disable-cups 34CONFIGURE_ARGS+= --disable-cups
35PLIST_SUBST+= CUPS="@comment " 35PLIST_SUBST+= CUPS="@comment "
36.endif 36.endif
 37
 38.if !empty(PKG_OPTIONS:Mfontconfig)
 39.include "../../fonts/fontconfig/buildlink3.mk"
 40.else
 41CONFIGURE_ARGS+= --disable-fontconfig
 42.endif