FreeBSD Bugzilla – Attachment 166971 Details for
Bug 207181
print/foomatic-filters: Fix conflict with print/cups-filters
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
all patches
patch-all_files (text/plain), 2.90 KB, created by
Vladimir Omelchuk
on 2016-02-14 09:45:13 UTC
(
hide
)
Description:
all patches
Filename:
MIME Type:
Creator:
Vladimir Omelchuk
Created:
2016-02-14 09:45:13 UTC
Size:
2.90 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile.orig 2016-02-14 08:21:41.501582000 +0200 >+++ Makefile 2016-02-14 10:51:16.346786875 +0200 >@@ -3,7 +3,7 @@ > > PORTNAME= foomatic-filters > PORTVERSION= 4.0.17 >-PORTREVISION= 4 >+PORTREVISION= 5 > CATEGORIES= print > MASTER_SITES= http://www.openprinting.org/download/foomatic/ > >@@ -15,8 +15,6 @@ > > LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus > >-CONFLICTS= cups-filters-1.8* >- > USES= autoreconf ghostscript perl5 pkgconfig > GNU_CONFIGURE= yes > CONFIGURE_ENV= ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \ >@@ -75,6 +73,8 @@ > @${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' ${WRKSRC}/foomaticrip.c > @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/foomaticrip.c > @${REINPLACE_CMD} -e '/filter.conf/ s|if|#if|g' ${WRKSRC}/Makefile.in >+ @${MV} ${WRKSRC}/beh.in ${WRKSRC}/foomatic-beh.in >+ @${REINPLACE_CMD} -e 's|beh|foomatic-beh|' ${WRKSRC}/foomatic-beh.in > > post-install: > @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/foomatic-rip > >Index: pkg-plist >=================================================================== >--- pkg-plist.orig 2015-10-08 23:31:16.000000000 +0300 >+++ pkg-plist 2016-02-14 09:48:34.371215895 +0200 >@@ -1,6 +1,6 @@ > bin/foomatic-rip > @sample etc/foomatic/filter.conf.sample >-libexec/cups/backend/beh >+libexec/cups/backend/foomatic-beh > libexec/cups/filter/foomatic-rip > lib/ppr/interfaces/foomatic-rip > lib/ppr/lib/foomatic-rip > >Index: files/patch-Makefile.am >=================================================================== >--- Makefile.am.orig 2012-07-02 14:50:46 UTC >+++ Makefile.am >@@ -76,7 +76,7 @@ install-cups: install-bin > ${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_FILTERS) > ${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_BACKENDS) > ln -sf $(BINDIR)/foomatic-rip $(DESTDIR)$(CUPS_FILTERS) >- ${INSTALL} -m 755 beh $(DESTDIR)$(CUPS_BACKENDS) >+ ${INSTALL} -m 755 foomatic-beh $(DESTDIR)$(CUPS_BACKENDS) > > install-ppr: install-bin > ${SRC}/mkinstalldirs $(DESTDIR)$(PPR_INTERFACES) >@@ -102,7 +102,7 @@ install-man: > > # Clean up the source directory > clean: remove-trash >- rm -f *.o foomatic-rip foomatic-rip.1 beh >+ rm -f *.o foomatic-rip foomatic-rip.1 foomatic-beh > rm -f .testing-stamp stamp-h1 > rm -f test/*.out > >@@ -140,7 +140,7 @@ uninstall-etc: > > uninstall-cups: > rm -f $(DESTDIR)$(CUPS_FILTERS)/foomatic-rip >- rm -f $(DESTDIR)$(CUPS_BACKENDS)/beh >+ rm -f $(DESTDIR)$(CUPS_BACKENDS)/foomatic-beh > rmdir $(DESTDIR)$(CUPS_FILTERS) || : > rmdir $(DESTDIR)$(CUPS_BACKENDS) || : > rmdir $(DESTDIR)$(CUPS) || : > >Index: files/patch-configure.ac >=================================================================== >--- configure.ac.orig 2012-07-02 14:50:46 UTC >+++ configure.ac >@@ -148,7 +148,7 @@ AC_ARG_WITH(execpath,[ --with-execpath= > AC_MSG_RESULT([Execpath: $EXECPATH]) > AC_SUBST(EXECPATH) > >-AC_CONFIG_FILES([Makefile beh foomatic-rip.1]) >+AC_CONFIG_FILES([Makefile foomatic-beh foomatic-rip.1]) > AC_CONFIG_HEADER(config.h) > AC_OUTPUT >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 207181
: 166971 |
166972
|
166973
|
166974
|
166975