diff options
| -rw-r--r-- | print/cups-filters/Makefile | 11 | ||||
| -rw-r--r-- | print/cups-filters/distinfo | 4 | ||||
| -rw-r--r-- | print/cups-filters/patches/patch-configure.ac | 32 | ||||
| -rw-r--r-- | print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c | 15 |
4 files changed, 58 insertions, 4 deletions
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 39ebb97f093..60c6aed2a3f 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2015/04/25 14:24:45 tnn Exp $ +# $NetBSD: Makefile,v 1.21 2015/06/11 19:13:46 asau Exp $ DISTNAME= cups-filters-1.0.68 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= http://openprinting.org/download/cups-filters/ EXTRACT_SUFX= .tar.xz @@ -9,11 +9,12 @@ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters COMMENT= Backends, filters, and other software for cups -#LICENSE= # TODO: (see mk/license.mk) +LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND mit GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= bash:run pkg-config +USE_TOOLS+= autoconf USE_LANGUAGES= c c++ CONFLICTS+= cups<1.6 @@ -26,12 +27,16 @@ REPLACE_BASH+= filter/textonly CONFIGURE_ARGS+= --with-rcdir=${PREFIX}/share/examples/rc.d CONFIGURE_ARGS+= --with-rclevels="" +CONFIGURE_ARGS+= --with-shell=${TOOLS_PATH.bash} INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/cups-filters CONF_FILES= ${PREFIX}/share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf ${PKG_SYSCONFDIR}/fonts/conf.d/99pdftoopvp.conf CONF_FILES= ${PREFIX}/share/examples/cups-filters/cups-browsed.conf ${PKG_SYSCONFDIR}/cups/cups-browsed.conf +pre-configure: + cd ${WRKSRC} && autoconf + post-install: ${MV} ${DESTDIR}${PREFIX}/etc/cups/cups-browsed.conf ${DESTDIR}${PREFIX}/share/examples/cups-filters/cups-browsed.conf diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo index 40721e967cd..b02f229d0f7 100644 --- a/print/cups-filters/distinfo +++ b/print/cups-filters/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.15 2015/04/19 18:44:25 wiz Exp $ +$NetBSD: distinfo,v 1.16 2015/06/11 19:13:46 asau Exp $ SHA1 (cups-filters-1.0.68.tar.xz) = 3564711352e93fe315774200375bedc2fecdde97 RMD160 (cups-filters-1.0.68.tar.xz) = ae0e9e0f3c20175f2e178167459e08cf587d36fd Size (cups-filters-1.0.68.tar.xz) = 1336216 bytes +SHA1 (patch-configure.ac) = 189a6b77d53a4026bcb070ec5722551b9ce7bc1e +SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = 0cb7be02d76ce64dd167e6a1b849393fc09baeea diff --git a/print/cups-filters/patches/patch-configure.ac b/print/cups-filters/patches/patch-configure.ac new file mode 100644 index 00000000000..19e83d34d8b --- /dev/null +++ b/print/cups-filters/patches/patch-configure.ac @@ -0,0 +1,32 @@ +$NetBSD: patch-configure.ac,v 1.1 2015/06/11 19:13:46 asau Exp $ + +Add a --with-shell option in order to avoid hardcoding "/bin/bash" inside +filter/foomaticrip.c. + +--- configure.ac.orig 2015-04-13 14:47:41.000000000 +0000 ++++ configure.ac +@@ -622,6 +622,16 @@ fi + AC_SUBST(SED_EXTENDED_REGEX_OPT) + AC_SUBST(CUPS_GHOSTSCRIPT) + ++# ========================================================= ++# Select a different shell instead of the default /bin/bash ++# ========================================================= ++AC_ARG_WITH([shell], ++ [AS_HELP_STRING([--with-shell=path], [Specify path for a modern shell.])], ++ [with_shell="$withval"], ++ [with_shell="/bin/bash"] ++) ++AC_DEFINE_UNQUOTED([SHELL], "$with_shell", [Path for a modern shell])] ++ + # ===================== + # Prepare all .in files + # ===================== +@@ -659,6 +669,7 @@ Build configuration: + png: ${with_png} + php: ${with_php} + php-config: ${with_php_config} ++ shell: ${with_shell} + test-font: ${with_test_font_path} + tiff: ${with_tiff} + avahi: ${enable_avahi} diff --git a/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c b/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c new file mode 100644 index 00000000000..181c3958e6a --- /dev/null +++ b/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c @@ -0,0 +1,15 @@ +$NetBSD: patch-filter_foomatic-rip_foomaticrip.c,v 1.4 2015/06/11 19:13:46 asau Exp $ + +Adjust according the --with-shell option. + +--- filter/foomatic-rip/foomaticrip.c.orig 2015-02-13 22:36:44.000000000 +0000 ++++ filter/foomatic-rip/foomaticrip.c +@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo + "/opt/cups/filter:" + "/usr/lib/cups/filter"; + +-char modern_shell[64] = "/bin/bash"; ++char modern_shell[64] = SHELL; + + void config_set_option(const char *key, const char *value) + { |