Thu Apr 23 09:29:22 2015 UTC ()
Explicitly disable epoll on illumos, it is provided for Linux compat only.


(jperkin)
diff -r1.217 -r1.218 pkgsrc/print/cups/Makefile
diff -r1.3 -r1.4 pkgsrc/print/cups15/Makefile
cvs diff -r1.217 -r1.218 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2015/03/14 21:07:37 1.217
+++ pkgsrc/print/cups/Makefile 2015/04/23 09:29:22 1.218
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.217 2015/03/14 21:07:37 tnn Exp $ 1# $NetBSD: Makefile,v 1.218 2015/04/23 09:29:22 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.0.2 9BASE_VERS= 2.0.2
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
@@ -46,28 +46,30 @@ CONFIGURE_ARGS+= --without-menudir @@ -46,28 +46,30 @@ CONFIGURE_ARGS+= --without-menudir
46CONFIGURE_ARGS+= --without-perl 46CONFIGURE_ARGS+= --without-perl
47CONFIGURE_ARGS+= --without-php 47CONFIGURE_ARGS+= --without-php
48CONFIGURE_ARGS+= --without-python 48CONFIGURE_ARGS+= --without-python
49CONFIGURE_ARGS+= --without-java 49CONFIGURE_ARGS+= --without-java
50CONFIGURE_ARGS+= --disable-gssapi 50CONFIGURE_ARGS+= --disable-gssapi
51CONFIGURE_ARGS+= --disable-gnutls 51CONFIGURE_ARGS+= --disable-gnutls
52 52
53CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 53CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
54 54
55.include "../../mk/bsd.prefs.mk" 55.include "../../mk/bsd.prefs.mk"
56.include "options.mk" 56.include "options.mk"
57 57
58.if ${OPSYS} == "SunOS" 58.if ${OPSYS} == "SunOS"
59LIBS_SSP = -lssp_nonshared -lssp 59LIBS_SSP= -lssp_nonshared -lssp
60CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} 60CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
 61# Explicitly disable epoll on illumos, it is provided for Linux compat only.
 62CONFIGURE_ENV+= ac_cv_func_epoll_create=no
61.endif 63.endif
62LIBS+= ${BUILDLINK_LDADD.iconv} 64LIBS+= ${BUILDLINK_LDADD.iconv}
63 65
64PLIST_VARS+= notmac 66PLIST_VARS+= notmac
65.if ${OPSYS} != "Darwin" 67.if ${OPSYS} != "Darwin"
66PLIST.notmac= yes 68PLIST.notmac= yes
67.endif 69.endif
68 70
69# Avoid the following error when compiling with clang. 71# Avoid the following error when compiling with clang.
70# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 72# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
71# can not be used when making a shared object; recompile with -fPIC 73# can not be used when making a shared object; recompile with -fPIC
72.if ${OPSYS} == "FreeBSD" 74.if ${OPSYS} == "FreeBSD"
73BUILDLINK_TRANSFORM+= rm:-Wl,-pie 75BUILDLINK_TRANSFORM+= rm:-Wl,-pie
cvs diff -r1.3 -r1.4 pkgsrc/print/cups15/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups15/Attic/Makefile 2015/03/14 21:03:48 1.3
+++ pkgsrc/print/cups15/Attic/Makefile 2015/04/23 09:29:22 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2015/03/14 21:03:48 tnn Exp $ 1# $NetBSD: Makefile,v 1.4 2015/04/23 09:29:22 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}
11 11
12PKGREVISION= 12 12PKGREVISION= 12
13CATEGORIES= print 13CATEGORIES= print
14MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 14MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -58,28 +58,30 @@ CONFIGURE_ARGS+= --without-perl @@ -58,28 +58,30 @@ CONFIGURE_ARGS+= --without-perl
58CONFIGURE_ARGS+= --without-php 58CONFIGURE_ARGS+= --without-php
59CONFIGURE_ARGS+= --without-python 59CONFIGURE_ARGS+= --without-python
60CONFIGURE_ARGS+= --without-java 60CONFIGURE_ARGS+= --without-java
61CONFIGURE_ARGS+= --disable-gssapi 61CONFIGURE_ARGS+= --disable-gssapi
62CONFIGURE_ARGS+= --disable-gnutls 62CONFIGURE_ARGS+= --disable-gnutls
63CONFIGURE_ARGS+= --disable-ldap 63CONFIGURE_ARGS+= --disable-ldap
64 64
65CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 65CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
66 66
67.include "../../mk/bsd.prefs.mk" 67.include "../../mk/bsd.prefs.mk"
68.include "options.mk" 68.include "options.mk"
69 69
70.if ${OPSYS} == "SunOS" 70.if ${OPSYS} == "SunOS"
71LIBS_SSP = -lssp_nonshared -lssp 71LIBS_SSP= -lssp_nonshared -lssp
72CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} 72CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
 73# Explicitly disable epoll on illumos, it is provided for Linux compat only.
 74CONFIGURE_ENV+= ac_cv_func_epoll_create=no
73.endif 75.endif
74LIBS+= ${BUILDLINK_LDADD.iconv} 76LIBS+= ${BUILDLINK_LDADD.iconv}
75 77
76PLIST_VARS+= notmac 78PLIST_VARS+= notmac
77.if ${OPSYS} != "Darwin" 79.if ${OPSYS} != "Darwin"
78PLIST.notmac= yes 80PLIST.notmac= yes
79.endif 81.endif
80 82
81# Avoid the following error when compiling with clang. 83# Avoid the following error when compiling with clang.
82# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 84# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
83# can not be used when making a shared object; recompile with -fPIC 85# can not be used when making a shared object; recompile with -fPIC
84.if ${OPSYS} == "FreeBSD" 86.if ${OPSYS} == "FreeBSD"
85BUILDLINK_TRANSFORM+= rm:-Wl,-pie 87BUILDLINK_TRANSFORM+= rm:-Wl,-pie