diff options
| author | richard <richard@pkgsrc.org> | 2015-10-10 17:03:02 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2015-10-10 17:03:02 +0000 |
| commit | 84f13417c30370518b3d65e5d6167d6200406a88 (patch) | |
| tree | 71b6d4a942e5c2300d62dbd08791f0b96e1fdfaf /print/cups15 | |
| parent | c15875cc0b79668702538ecfbc178e4d7659c74f (diff) | |
| download | pkgsrc-84f13417c30370518b3d65e5d6167d6200406a88.tar.gz | |
SunOS doesn't have arc4random_stir either
Diffstat (limited to 'print/cups15')
| -rw-r--r-- | print/cups15/Makefile | 6 | ||||
| -rw-r--r-- | print/cups15/distinfo | 4 | ||||
| -rw-r--r-- | print/cups15/patches/patch-config.h.in | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/print/cups15/Makefile b/print/cups15/Makefile index c23a2235ff6..dcbbce0d81e 100644 --- a/print/cups15/Makefile +++ b/print/cups15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/09/05 13:03:22 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2015/10/10 17:03:02 richard Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -73,8 +73,8 @@ CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} .include "options.mk" .if ${OPSYS} == "SunOS" -LIBS_SSP= -lssp_nonshared -lssp -CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} +#LIBS_SSP= -lssp_nonshared -lssp +#CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} # Explicitly disable epoll on illumos, it is provided for Linux compat only. CONFIGURE_ENV+= ac_cv_func_epoll_create=no .endif diff --git a/print/cups15/distinfo b/print/cups15/distinfo index 6b2617eeba9..2564cf00aac 100644 --- a/print/cups15/distinfo +++ b/print/cups15/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2015/09/05 13:03:22 jperkin Exp $ +$NetBSD: distinfo,v 1.4 2015/10/10 17:03:02 richard Exp $ SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6 @@ -20,7 +20,7 @@ SHA1 (patch-au) = c929e9fd49cfc54d5f69a1982632b455f67b08fd SHA1 (patch-conf_Makefile) = 5b5d45abc1e8d6b73a1ad6b7a7098714d4c55395 SHA1 (patch-config-scripts_cups-common.m4) = 5b6a21afef0b16df67af901b8bbf1317eaaad53e SHA1 (patch-config-scripts_cups-gssapi.m4) = c81240b2ce05133a1ce4981ef6286ac03bcabcf5 -SHA1 (patch-config.h.in) = 0f072063d24810dcbdd2d095b9f2fa6bab44ff20 +SHA1 (patch-config.h.in) = 6da69fa910a0af25e1277d93bfb0bb09e5cec941 SHA1 (patch-filter_raster.c) = fc48e9cc7f7f32355816355dfc199157a00246c7 SHA1 (patch-ppdc_Makefile) = 50ba637ab159c19225690d8cf1c28dc7811f7275 SHA1 (patch-scheduler_auth.c) = 29cd4378eb4ceeb1e618534fc5a9975022dbcf2c diff --git a/print/cups15/patches/patch-config.h.in b/print/cups15/patches/patch-config.h.in index 0461e7f7bd3..b009bf1fa1e 100644 --- a/print/cups15/patches/patch-config.h.in +++ b/print/cups15/patches/patch-config.h.in @@ -1,6 +1,7 @@ -$NetBSD: patch-config.h.in,v 1.1 2014/06/17 13:17:13 wiz Exp $ +$NetBSD: patch-config.h.in,v 1.2 2015/10/10 17:03:02 richard Exp $ * OpenBSD has no arc4random_stir +* Neither does SunOS --- config.h.in.orig 2012-03-21 04:45:48.000000000 +0000 +++ config.h.in @@ -8,7 +9,7 @@ $NetBSD: patch-config.h.in,v 1.1 2014/06/17 13:17:13 wiz Exp $ #ifdef HAVE_ARC4RANDOM # define CUPS_RAND() arc4random() -+#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__sun) +# define CUPS_SRAND(v) +#else # define CUPS_SRAND(v) arc4random_stir() |