Thu Feb 25 17:52:46 2016 UTC ()
Use OPSYSVARS.


(jperkin)
diff -r1.226 -r1.227 pkgsrc/print/cups/Makefile
diff -r1.9 -r1.10 pkgsrc/print/cups15/Makefile
diff -r1.17 -r1.18 pkgsrc/print/ghostscript-agpl/Makefile
diff -r1.19 -r1.20 pkgsrc/print/ghostscript-gpl/Makefile
diff -r1.97 -r1.98 pkgsrc/print/libgnomeprint/Makefile
diff -r1.18 -r1.19 pkgsrc/print/mp/Makefile
diff -r1.15 -r1.16 pkgsrc/print/rtf2latex/Makefile
cvs diff -r1.226 -r1.227 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2016/02/07 11:29:30 1.226
+++ pkgsrc/print/cups/Makefile 2016/02/25 17:52:45 1.227
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.226 2016/02/07 11:29:30 leot Exp $ 1# $NetBSD: Makefile,v 1.227 2016/02/25 17:52:45 jperkin Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${DIST_VERS:S/-/./g} 8PKGNAME= cups-${DIST_VERS:S/-/./g}
9BASE_VERS= 2.1.3 9BASE_VERS= 2.1.3
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11CATEGORIES= print 11CATEGORIES= print
12MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/ 12MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
@@ -60,29 +60,27 @@ CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*: @@ -60,29 +60,27 @@ CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:
60# Explicitly disable epoll on illumos, it is provided for Linux compat only. 60# Explicitly disable epoll on illumos, it is provided for Linux compat only.
61CONFIGURE_ENV+= ac_cv_func_epoll_create=no 61CONFIGURE_ENV+= ac_cv_func_epoll_create=no
62.endif 62.endif
63LIBS+= ${BUILDLINK_LDADD.iconv} 63LIBS+= ${BUILDLINK_LDADD.iconv}
64 64
65PLIST_VARS+= notmac 65PLIST_VARS+= notmac
66.if ${OPSYS} != "Darwin" 66.if ${OPSYS} != "Darwin"
67PLIST.notmac= yes 67PLIST.notmac= yes
68.endif 68.endif
69 69
70# Avoid the following error when compiling with clang. 70# Avoid the following error when compiling with clang.
71# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 71# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
72# can not be used when making a shared object; recompile with -fPIC 72# can not be used when making a shared object; recompile with -fPIC
73.if ${OPSYS} == "FreeBSD" 73BUILDLINK_TRANSFORM.FreeBSD+= rm:-Wl,-pie
74BUILDLINK_TRANSFORM+= rm:-Wl,-pie 
75.endif 
76 74
77# CUPS_USER user to run filter and CGI programs as 75# CUPS_USER user to run filter and CGI programs as
78# CUPS_GROUP group to run filter and CGI programs as 76# CUPS_GROUP group to run filter and CGI programs as
79# CUPS_SYSTEM_GROUPS group for system administration 77# CUPS_SYSTEM_GROUPS group for system administration
80# 78#
81CUPS_USER?= lp 79CUPS_USER?= lp
82CUPS_GROUP?= lp 80CUPS_GROUP?= lp
83CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP} 81CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP}
84FILES_SUBST+= CUPS_USER=${CUPS_USER} 82FILES_SUBST+= CUPS_USER=${CUPS_USER}
85FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 83FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
86FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q} 84FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
87 85
88PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS 86PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS
cvs diff -r1.9 -r1.10 pkgsrc/print/cups15/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups15/Attic/Makefile 2015/10/10 17:05:17 1.9
+++ pkgsrc/print/cups15/Attic/Makefile 2016/02/25 17:52:45 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2015/10/10 17:05:17 richard Exp $ 1# $NetBSD: Makefile,v 1.10 2016/02/25 17:52:45 jperkin Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${DIST_VERS:S/-/./g} 8PKGNAME= cups-${DIST_VERS:S/-/./g}
9BASE_VERS= 1.5.4 9BASE_VERS= 1.5.4
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11PKGREVISION= 14 11PKGREVISION= 14
12 12
13# Fix for https://www.cups.org/str.php?L4609 13# Fix for https://www.cups.org/str.php?L4609
14PATCH_SITES= http://www.cups.org/strfiles.php/3482/ 14PATCH_SITES= http://www.cups.org/strfiles.php/3482/
@@ -80,29 +80,27 @@ CONFIGURE_ENV+= ac_cv_func_epoll_create @@ -80,29 +80,27 @@ CONFIGURE_ENV+= ac_cv_func_epoll_create
80.endif 80.endif
81LIBS+= ${BUILDLINK_LDADD.iconv} 81LIBS+= ${BUILDLINK_LDADD.iconv}
82 82
83PLIST_VARS+= mac notmac 83PLIST_VARS+= mac notmac
84.if ${OPSYS} == "Darwin" 84.if ${OPSYS} == "Darwin"
85PLIST.mac= yes 85PLIST.mac= yes
86.else 86.else
87PLIST.notmac= yes 87PLIST.notmac= yes
88.endif 88.endif
89 89
90# Avoid the following error when compiling with clang. 90# Avoid the following error when compiling with clang.
91# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 91# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
92# can not be used when making a shared object; recompile with -fPIC 92# can not be used when making a shared object; recompile with -fPIC
93.if ${OPSYS} == "FreeBSD" 93BUILDLINK_TRANSFORM.FreeBSD+= rm:-Wl,-pie
94BUILDLINK_TRANSFORM+= rm:-Wl,-pie 
95.endif 
96 94
97# CUPS_USER user to run filter and CGI programs as 95# CUPS_USER user to run filter and CGI programs as
98# CUPS_GROUP group to run filter and CGI programs as 96# CUPS_GROUP group to run filter and CGI programs as
99# CUPS_SYSTEM_GROUPS group for system administration 97# CUPS_SYSTEM_GROUPS group for system administration
100# 98#
101CUPS_USER?= lp 99CUPS_USER?= lp
102CUPS_GROUP?= lp 100CUPS_GROUP?= lp
103CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP} 101CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP}
104FILES_SUBST+= CUPS_USER=${CUPS_USER} 102FILES_SUBST+= CUPS_USER=${CUPS_USER}
105FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 103FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
106FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q} 104FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
107 105
108PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS 106PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS
cvs diff -r1.17 -r1.18 pkgsrc/print/ghostscript-agpl/Makefile (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/Makefile 2015/12/10 11:58:58 1.17
+++ pkgsrc/print/ghostscript-agpl/Makefile 2016/02/25 17:52:45 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2015/12/10 11:58:58 markd Exp $ 1# $NetBSD: Makefile,v 1.18 2016/02/25 17:52:45 jperkin Exp $
2 2
3DISTNAME= ghostscript-${GS_VERSION} 3DISTNAME= ghostscript-${GS_VERSION}
4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/} 4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \ 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
8 http://downloads.ghostscript.com/public/ 8 http://downloads.ghostscript.com/public/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://ghostscript.sourceforge.net/ 12HOMEPAGE= http://ghostscript.sourceforge.net/
13COMMENT= Postscript interpreter 13COMMENT= Postscript interpreter
14 14
@@ -55,42 +55,38 @@ CPPFLAGS+= -Ijpeg @@ -55,42 +55,38 @@ CPPFLAGS+= -Ijpeg
55 55
56.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4") 56.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
57CFLAGS+= -DA4 57CFLAGS+= -DA4
58.endif 58.endif
59 59
60REQD_DIRS+= share/ghostscript 60REQD_DIRS+= share/ghostscript
61 61
62SUBST_CLASSES+= resdir 62SUBST_CLASSES+= resdir
63SUBST_STAGE.resdir= post-extract 63SUBST_STAGE.resdir= post-extract
64SUBST_MESSAGE.resdir= Fixing resource directory path 64SUBST_MESSAGE.resdir= Fixing resource directory path
65SUBST_FILES.resdir= Resource/Init/gs_res.ps 65SUBST_FILES.resdir= Resource/Init/gs_res.ps
66SUBST_SED.resdir= -e "s|/Resource/|${GS_RESOURCEDIR}/|g" 66SUBST_SED.resdir= -e "s|/Resource/|${GS_RESOURCEDIR}/|g"
67 67
68.if ${OPSYS} == "HPUX" 68CONFIGURE_ENV.HPUX+= ac_cv_func_fopen64=no
69CONFIGURE_ENV+= ac_cv_func_fopen64=no 
70.endif 
71 69
72# On Linux-*-x86_64, there was an error message: 70# On Linux-*-x86_64, there was an error message:
73# gp_unix.o: relocation R_X86_64_32 against `a local symbol' can not be 71# gp_unix.o: relocation R_X86_64_32 against `a local symbol' can not be
74# used when making a shared object; recompile with -fPIC 72# used when making a shared object; recompile with -fPIC
75.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang) 73.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
76CFLAGS+= -fPIC 74CFLAGS+= -fPIC
77.endif 75.endif
78 76
79# Interim IRIX build fix, the real problem is that fontconfig.pc doesn't 77# Interim IRIX build fix, the real problem is that fontconfig.pc doesn't
80# require linking against libiconv when it should do so. 78# require linking against libiconv when it should do so.
81.if ${OPSYS} == "IRIX" 79BUILDLINK_TRANSFORM.IRIX+= l:fontconfig:fontconfig:iconv
82BUILDLINK_TRANSFORM+= l:fontconfig:fontconfig:iconv 
83.endif 
84 80
85CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib 81CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib
86 82
87.include "options.mk" 83.include "options.mk"
88 84
89post-extract: 85post-extract:
90 ${MKDIR} ${WRKSRC}/bin 86 ${MKDIR} ${WRKSRC}/bin
91 ${MKDIR} ${WRKSRC}/obj 87 ${MKDIR} ${WRKSRC}/obj
92 ${RM} -rf ${WRKSRC}/freetype 88 ${RM} -rf ${WRKSRC}/freetype
93 ${RM} -rf ${WRKSRC}/jbig2dec 89 ${RM} -rf ${WRKSRC}/jbig2dec
94 ${RM} -rf ${WRKSRC}/jpeg 90 ${RM} -rf ${WRKSRC}/jpeg
95 ${RM} -rf ${WRKSRC}/lcms2 91 ${RM} -rf ${WRKSRC}/lcms2
96 ${RM} -rf ${WRKSRC}/libpng 92 ${RM} -rf ${WRKSRC}/libpng
cvs diff -r1.19 -r1.20 pkgsrc/print/ghostscript-gpl/Makefile (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-gpl/Makefile 2015/09/23 08:25:09 1.19
+++ pkgsrc/print/ghostscript-gpl/Makefile 2016/02/25 17:52:45 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2015/09/23 08:25:09 he Exp $ 1# $NetBSD: Makefile,v 1.20 2016/02/25 17:52:45 jperkin Exp $
2 2
3DISTNAME= ghostscript-${GS_VERSION} 3DISTNAME= ghostscript-${GS_VERSION}
4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-gpl/} 4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-gpl/}
5PKGREVISION= 7 5PKGREVISION= 7
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
8MASTER_SITES+= http://ghostscript.com/releases/ 8MASTER_SITES+= http://ghostscript.com/releases/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://ghostscript.sourceforge.net/ 12HOMEPAGE= http://ghostscript.sourceforge.net/
13COMMENT= Postscript interpreter 13COMMENT= Postscript interpreter
14 14
@@ -56,42 +56,38 @@ CPPFLAGS+= -Ijpeg @@ -56,42 +56,38 @@ CPPFLAGS+= -Ijpeg
56 56
57.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4") 57.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
58CFLAGS+= -DA4 58CFLAGS+= -DA4
59.endif 59.endif
60 60
61REQD_DIRS+= share/ghostscript 61REQD_DIRS+= share/ghostscript
62 62
63SUBST_CLASSES+= resdir 63SUBST_CLASSES+= resdir
64SUBST_STAGE.resdir= post-extract 64SUBST_STAGE.resdir= post-extract
65SUBST_MESSAGE.resdir= Fixing resource directory path 65SUBST_MESSAGE.resdir= Fixing resource directory path
66SUBST_FILES.resdir= Resource/Init/gs_res.ps 66SUBST_FILES.resdir= Resource/Init/gs_res.ps
67SUBST_SED.resdir= -e "s|/Resource/|${GS_RESOURCEDIR}/|g" 67SUBST_SED.resdir= -e "s|/Resource/|${GS_RESOURCEDIR}/|g"
68 68
69.if ${OPSYS} == "HPUX" 69CONFIGURE_ENV.HPUX+= ac_cv_func_fopen64=no
70CONFIGURE_ENV+= ac_cv_func_fopen64=no 
71.endif 
72 70
73# On Linux-*-x86_64, there was an error message: 71# On Linux-*-x86_64, there was an error message:
74# gp_unix.o: relocation R_X86_64_32 against `a local symbol' can not be 72# gp_unix.o: relocation R_X86_64_32 against `a local symbol' can not be
75# used when making a shared object; recompile with -fPIC 73# used when making a shared object; recompile with -fPIC
76.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang) 74.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
77CFLAGS+= -fPIC 75CFLAGS+= -fPIC
78.endif 76.endif
79 77
80# Interim IRIX build fix, the real problem is that fontconfig.pc doesn't 78# Interim IRIX build fix, the real problem is that fontconfig.pc doesn't
81# require linking against libiconv when it should do so. 79# require linking against libiconv when it should do so.
82.if ${OPSYS} == "IRIX" 80BUILDLINK_TRANSFORM.IRIX+= l:fontconfig:fontconfig:iconv
83BUILDLINK_TRANSFORM+= l:fontconfig:fontconfig:iconv 
84.endif 
85 81
86CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib 82CONFIGURE_ENV+= LPLIBDIR=${PREFIX}/lib
87 83
88# On OpenBSD 5.3, libxcb is required libXt. 84# On OpenBSD 5.3, libxcb is required libXt.
89LDFLAGS.OpenBSD+= -lxcb 85LDFLAGS.OpenBSD+= -lxcb
90 86
91.if ${OS_VARIANT} == "SCOOSR5" 87.if ${OS_VARIANT} == "SCOOSR5"
92# SCO OpenServer 5.0.7/3.2 has windows.h, and configure expacts it for MS Windows. 88# SCO OpenServer 5.0.7/3.2 has windows.h, and configure expacts it for MS Windows.
93CONFIGURE_ENV+= ac_cv_header_windows_h=no 89CONFIGURE_ENV+= ac_cv_header_windows_h=no
94.endif 90.endif
95 91
96.include "options.mk" 92.include "options.mk"
97 93
cvs diff -r1.97 -r1.98 pkgsrc/print/libgnomeprint/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libgnomeprint/Attic/Makefile 2015/04/25 14:24:46 1.97
+++ pkgsrc/print/libgnomeprint/Attic/Makefile 2016/02/25 17:52:45 1.98
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.97 2015/04/25 14:24:46 tnn Exp $ 1# $NetBSD: Makefile,v 1.98 2016/02/25 17:52:45 jperkin Exp $
2# 2#
3 3
4DISTNAME= libgnomeprint-2.18.8 4DISTNAME= libgnomeprint-2.18.8
5PKGREVISION= 22 5PKGREVISION= 22
6CATEGORIES= print gnome 6CATEGORIES= print gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.18/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.18/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.levien.com/gnome/print-arch.html 11HOMEPAGE= http://www.levien.com/gnome/print-arch.html
12COMMENT= Library for the GNOME2 Printing Architecture 12COMMENT= Library for the GNOME2 Printing Architecture
13 13
14USE_TOOLS+= bison flex gmake intltool msgfmt pkg-config 14USE_TOOLS+= bison flex gmake intltool msgfmt pkg-config
@@ -27,32 +27,28 @@ PKG_SUPPORTED_OPTIONS= cups @@ -27,32 +27,28 @@ PKG_SUPPORTED_OPTIONS= cups
27.include "../../mk/bsd.options.mk" 27.include "../../mk/bsd.options.mk"
28 28
29PLIST_VARS+= cups 29PLIST_VARS+= cups
30.if !empty(PKG_OPTIONS:Mcups) 30.if !empty(PKG_OPTIONS:Mcups)
31.include "../../print/libgnomecups/buildlink3.mk" 31.include "../../print/libgnomecups/buildlink3.mk"
32CONFIGURE_ARGS+= --with-cups 32CONFIGURE_ARGS+= --with-cups
33PLIST.cups= yes 33PLIST.cups= yes
34.else 34.else
35CONFIGURE_ARGS+= --without-cups 35CONFIGURE_ARGS+= --without-cups
36.endif 36.endif
37 37
38CONFIGURE_ARGS+= --without-papi 38CONFIGURE_ARGS+= --without-papi
39 39
40.include "../../mk/bsd.prefs.mk" 
41 
42.if ${OPSYS} == "Darwin" 
43# AC_LTDL_SHLIBEXT doesn't work on Darwin (and would give the wrong 40# AC_LTDL_SHLIBEXT doesn't work on Darwin (and would give the wrong
44# answer here even if it did). 41# answer here even if it did).
45CONFIGURE_ENV+= libltdl_cv_shlibext=so 42CONFIGURE_ENV.Darwin+= libltdl_cv_shlibext=so
46.endif 
47 43
48PRINT_PLIST_AWK+= /cups/ { print "$${USE_CUPS}" $$0; next; } 44PRINT_PLIST_AWK+= /cups/ { print "$${USE_CUPS}" $$0; next; }
49 45
50.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
51.include "../../devel/glib2/buildlink3.mk" 47.include "../../devel/glib2/buildlink3.mk"
52.include "../../devel/libbonobo/buildlink3.mk" 48.include "../../devel/libbonobo/buildlink3.mk"
53.include "../../devel/pango/buildlink3.mk" 49.include "../../devel/pango/buildlink3.mk"
54.include "../../fonts/fontconfig/buildlink3.mk" 50.include "../../fonts/fontconfig/buildlink3.mk"
55.include "../../graphics/freetype2/buildlink3.mk" 51.include "../../graphics/freetype2/buildlink3.mk"
56.include "../../graphics/libart/buildlink3.mk" 52.include "../../graphics/libart/buildlink3.mk"
57.include "../../textproc/libxml2/buildlink3.mk" 53.include "../../textproc/libxml2/buildlink3.mk"
58.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/print/mp/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mp/Makefile 2012/10/08 13:45:42 1.18
+++ pkgsrc/print/mp/Makefile 2016/02/25 17:52:45 1.19
@@ -1,30 +1,26 @@ @@ -1,30 +1,26 @@
1# $NetBSD: Makefile,v 1.18 2012/10/08 13:45:42 asau Exp $ 1# $NetBSD: Makefile,v 1.19 2016/02/25 17:52:45 jperkin Exp $
2# 2#
3 3
4DISTNAME= mpdist-3.7.1 4DISTNAME= mpdist-3.7.1
5PKGNAME= mp-3.7.1 5PKGNAME= mp-3.7.1
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= print 7CATEGORIES= print
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpdist/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpdist/}
9 9
10MAINTAINER= kim@tac.nyc.ny.us 10MAINTAINER= kim@tac.nyc.ny.us
11HOMEPAGE= http://mpdist.sourceforge.net/ 11HOMEPAGE= http://mpdist.sourceforge.net/
12COMMENT= PostScript pretty printer 12COMMENT= PostScript pretty printer
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16 16
17.include "../../mk/bsd.prefs.mk" 17CONFIGURE_ARGS.SunOS+= # empty
18 18CONFIGURE_ARGS.*+= --enable-bsd-print
19.if ${OPSYS} == "SunOS" 
20.else 
21CONFIGURE_ARGS+=--enable-bsd-print 
22.endif 
23 19
24BUILDLINK_DEPMETHOD.libXt?= build 20BUILDLINK_DEPMETHOD.libXt?= build
25 21
26.include "../../x11/gtk/buildlink3.mk" 22.include "../../x11/gtk/buildlink3.mk"
27.include "../../x11/libSM/buildlink3.mk" 23.include "../../x11/libSM/buildlink3.mk"
28.include "../../x11/libX11/buildlink3.mk" 24.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXt/buildlink3.mk" 25.include "../../x11/libXt/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/print/rtf2latex/Makefile (expand / switch to unified diff)

--- pkgsrc/print/rtf2latex/Makefile 2012/10/08 13:45:46 1.15
+++ pkgsrc/print/rtf2latex/Makefile 2016/02/25 17:52:45 1.16
@@ -1,25 +1,21 @@ @@ -1,25 +1,21 @@
1# $NetBSD: Makefile,v 1.15 2012/10/08 13:45:46 asau Exp $ 1# $NetBSD: Makefile,v 1.16 2016/02/25 17:52:45 jperkin Exp $
2 2
3DISTNAME= rtf2LaTeX.1.5 3DISTNAME= rtf2LaTeX.1.5
4PKGNAME= rtf2latex-1.5 4PKGNAME= rtf2latex-1.5
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= ftp://ftp.dante.de/pub/tex/support/rtf2latex/ 6MASTER_SITES= ftp://ftp.dante.de/pub/tex/support/rtf2latex/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Filter that converts RTF (MS's Rich Text Format) into LaTeX 9COMMENT= Filter that converts RTF (MS's Rich Text Format) into LaTeX
10 10
11WRKSRC= ${WRKDIR}/rtf2LaTeX 11WRKSRC= ${WRKDIR}/rtf2LaTeX
12NO_CONFIGURE= yes 12NO_CONFIGURE= yes
13 13
14post-extract: 14post-extract:
15 ${LN} -fs ${FILESDIR}/Makefile ${WRKSRC} 15 ${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
16 16
17.include "../../mk/bsd.prefs.mk" 17MAKE_ENV.SunOS+= XCFLAGS="${CPPFLAGS} -DSYSV" CC=${CC:Q}
18 
19.if ${OPSYS} == "SunOS" 
20MAKE_ENV+= XCFLAGS="${CPPFLAGS} -DSYSV" CC=${CC:Q} 
21.endif 
22 18
23INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 19INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
24 20
25.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"