Update to 1.25.6.

Remove libiconv fix from post-patch.  Fixed upstream.
This commit is contained in:
Tijl Coosemans 2019-09-25 15:13:26 +00:00
parent 89f5cf372b
commit a4438a4b63
4 changed files with 11 additions and 12 deletions

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cups-filters
PORTVERSION= 1.25.5
PORTVERSION= 1.25.6
CATEGORIES= print
MASTER_SITES= https://www.openprinting.org/download/cups-filters/
@ -134,7 +134,5 @@ post-patch:
${WRKSRC}/utils/cups-browsed.8 \
${WRKSRC}/utils/cups-browsed.conf.5 \
${WRKSRC}/utils/driverless.1
@${REINPLACE_CMD} '/^texttotext_LDADD =/s/$$/ ${ICONV_LIB}/' \
${WRKSRC}/Makefile.in
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1568193723
SHA256 (cups-filters-1.25.5.tar.xz) = b6e80020aef4fd2ad62674cfde1d68ebadd56ca170293fcba023d4628bef3c1f
SIZE (cups-filters-1.25.5.tar.xz) = 1450264
TIMESTAMP = 1569422355
SHA256 (cups-filters-1.25.6.tar.xz) = 92d40b647cbeda683645a1ef98c0f234fdfd3a34a861ebf93da1a22be499f2dd
SIZE (cups-filters-1.25.6.tar.xz) = 1482160

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig 2018-10-03 20:13:01 UTC
--- Makefile.in.orig 2019-09-23 16:11:51 UTC
+++ Makefile.in
@@ -5770,13 +5770,13 @@ $(cups_notifier_sources): utils/org.cups.cupsd.Notifie
@@ -5801,13 +5801,13 @@ $(cups_notifier_sources): utils/org.cups.cupsd.Notifie
distclean-local:
rm -rf *.cache *~
@ -9,16 +9,16 @@
$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
-@ENABLE_FOOMATIC_TRUE@ $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
-@ENABLE_DRIVERLESS_TRUE@ $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
-@ENABLE_DRIVERLESS_TRUE@ $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
-@ENABLE_FOOMATIC_TRUE@ $(LN_SRF) $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
-@ENABLE_DRIVERLESS_TRUE@ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
-@ENABLE_DRIVERLESS_TRUE@ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
+@ENABLE_FOOMATIC_TRUE@ $(INSTALL) -l rs $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
+@ENABLE_DRIVERLESS_TRUE@ $(INSTALL) -l rs $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
+@ENABLE_DRIVERLESS_TRUE@ $(INSTALL) -l rs $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
@ENABLE_BRAILLE_TRUE@ $(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
@ENABLE_BRAILLE_TRUE@ $(LN_S) -f vectortopdf $(DESTDIR)$(pkgfilterdir)/svgtopdf
@ENABLE_BRAILLE_TRUE@ $(LN_S) -f vectortopdf $(DESTDIR)$(pkgfilterdir)/xfigtopdf
@@ -5787,7 +5787,6 @@ install-exec-hook:
@@ -5818,7 +5818,6 @@ install-exec-hook:
@ENABLE_BRAILLE_TRUE@ $(LN_S) -f vectortobrf $(DESTDIR)$(pkgfilterdir)/vectortoubrl
@ENABLE_BRAILLE_TRUE@ $(LN_S) -f textbrftoindexv3 $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4

View file

@ -129,6 +129,7 @@ share/cups/ppdc/escp.h
%%BRAILLE%%share/cups/ppdc/liblouis4.defs
%%BRAILLE%%share/cups/ppdc/media-braille.defs
share/cups/ppdc/pcl.h
%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/INSTALL