FreeBSD Bugzilla – Attachment 144697 Details for
Bug 191209
print/gutenprint and children: update to 5.2.10, add STAGE support, fix DEPENDS
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for print/gutenprint-base
gutenprint-base.diff (text/plain), 9.99 KB, created by
Christoph Moench-Tegeder
on 2014-07-15 19:03:42 UTC
(
hide
)
Description:
patch for print/gutenprint-base
Filename:
MIME Type:
Creator:
Christoph Moench-Tegeder
Created:
2014-07-15 19:03:42 UTC
Size:
9.99 KB
patch
obsolete
>M Makefile >M distinfo >D files/patch-src_cups_Makefile.in >M files/patch-src_gimp2_Makefile.in >M pkg-plist > >Index: Makefile >=================================================================== >--- Makefile (revision 358473) >+++ Makefile (working copy) >@@ -3,7 +3,7 @@ > # $MCom: ports/print/gutenprint-base/Makefile,v 1.8 2007/03/30 16:45:02 ahze Exp $ > > PORTNAME?= gutenprint >-PORTVERSION= 5.2.8 >+PORTVERSION= 5.2.10 > CATEGORIES= print > MASTER_SITES= SF/gimp-print/gutenprint-5.2/${PORTVERSION} > PKGNAMESUFFIX?= -base >@@ -25,7 +25,6 @@ > CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include > LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib > >-NO_STAGE= yes > .include <bsd.port.pre.mk> > > .if ${SLAVE_PORT}=="yes" >@@ -32,13 +31,11 @@ > LIB_DEPENDS+= gutenprintui2.1:${PORTSDIR}/print/gutenprint-base > PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config > GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2` >-.else >-MAN1+= escputil.1 > .endif > > .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp" >-LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app \ >- gutenprint.3:${PORTSDIR}/print/gutenprint-base >+LIB_DEPENDS+= libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \ >+ libgutenprint.so:${PORTSDIR}/print/gutenprint-base > CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS > BUILD_WRKSRC= ${WRKSRC}/src/gimp2 > INSTALL_WRKSRC= ${WRKSRC}/src/gimp2 >@@ -47,13 +44,12 @@ > .endif > > .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups" >-LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client \ >- cupsimage.2:${PORTSDIR}/print/cups-image >+LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client \ >+ libcupsimage.so:${PORTSDIR}/print/cups-image > RUN_DEPENDS+= espgs:${PORTSDIR}/print/cups-pstoraster > CONFIGURE_ARGS+= --with-cups=${PREFIX} \ > --enable-cups-ppds \ > --enable-cups-level3-ppds >-MAN8+= cups-calibrate.8 cups-genppd.8 cups-genppdupdate.8 > BUILD_WRKSRC= ${WRKSRC}/src/cups > INSTALL_WRKSRC= ${WRKSRC}/src/cups > .else >@@ -61,9 +57,8 @@ > .endif > > .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="ijs" >-LIB_DEPENDS+= ijs.1:${PORTSDIR}/print/libijs >+LIB_DEPENDS+= libijs.so:${PORTSDIR}/print/libijs > CONFIGURE_ARGS+=--with-ijs=yes >-MAN1+= ijsgutenprint.1 > BUILD_WRKSRC= ${WRKSRC}/src/ghost > INSTALL_WRKSRC= ${WRKSRC}/src/ghost > .else >@@ -73,7 +68,7 @@ > .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="foomatic" > BUILD_DEPENDS+= foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine > RUN_DEPENDS+= foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine \ >- foomatic-db>0:${PORTSDIR}/print/foomatic-db >+ ${LOCALBASE}/share/cups/model/foomatic-db-ppds:${PORTSDIR}/print/foomatic-db > CONFIGURE_ARGS+=--with-foomatic=yes --with-foomatic3=yes > BUILD_WRKSRC= ${WRKSRC}/src/foomatic > INSTALL_WRKSRC= ${WRKSRC}/src/foomatic >@@ -106,9 +101,15 @@ > @(cd ${WRKSRC}/src/xml && ${MAKE}) > .endif > >+pre-install: >+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/gutenprint/5.2/modules >+ > post-install: > .if ${SLAVE_PORT}=="yes" >- @(cd ${WRKSRC}/man && ${GMAKE} ${INSTALL_TARGET}) >+ @(cd ${WRKSRC}/man && ${GMAKE} ${INSTALL_TARGET} DESTDIR=${STAGEDIR}) > .endif >+.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups" >+ @${LN} -s ${STAGEGIR}${LOCALBASE}/sbin/cups-genppd.5.2 ${STAGEDIR}${LOCALBASE}/sbin/cups-genppd >+.endif > > .include <bsd.port.post.mk> >Index: distinfo >=================================================================== >--- distinfo (revision 358473) >+++ distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (gutenprint-5.2.8.tar.bz2) = 8cb9d2b4dda2d33b221f21c8e1453aead5e37966a194c5a473735d12cdc1c8e0 >-SIZE (gutenprint-5.2.8.tar.bz2) = 5691472 >+SHA256 (gutenprint-5.2.10.tar.bz2) = 431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59 >+SIZE (gutenprint-5.2.10.tar.bz2) = 6241585 >Index: files/patch-src_cups_Makefile.in >=================================================================== >--- files/patch-src_cups_Makefile.in (revision 358473) >+++ files/patch-src_cups_Makefile.in (working copy) >@@ -1,15 +0,0 @@ >---- src/cups/Makefile.in.orig 2012-06-17 19:30:42.000000000 +0200 >-+++ src/cups/Makefile.in 2012-06-17 19:29:16.000000000 +0200 >-@@ -1242,10 +1242,10 @@ >- ppd-stamp-phony: $(PPD) >- >- ppd-catalog-clean: >-- -$(RM) -r catalog >-+ -$(RM) -rf catalog >- >- ppd-clean: >-- -$(RM) -r ppd >-+ -$(RM) -rf ppd >- >- ppd-stamp-pre: ppd-catalog-clean ppd-clean >- >Index: files/patch-src_gimp2_Makefile.in >=================================================================== >--- files/patch-src_gimp2_Makefile.in (revision 358473) >+++ files/patch-src_gimp2_Makefile.in (working copy) >@@ -1,11 +1,11 @@ >---- src/gimp2/Makefile.in.orig 2011-10-15 12:53:29.000000000 +0200 >-+++ src/gimp2/Makefile.in 2011-10-15 12:54:02.000000000 +0200 >-@@ -306,8 +306,8 @@ >+--- src/gimp2/Makefile.in.orig 2014-06-19 22:45:15.000000000 +0200 >++++ src/gimp2/Makefile.in 2014-06-19 22:45:48.000000000 +0200 >+@@ -409,8 +409,8 @@ > print_gimp.h > > print_SOURCES = $(COMMON_PRINT_SOURCES) print-print.c >--print_LDADD = $(GIMP2_LIBS) $(GUTENPRINTUI2_LIBS) >--print_DEPENDENCIES = $(GUTENPRINTUI2_LIBS) $(GUTENPRINT_LIBS) >+-print_LDADD = $(GIMP2_LIBS) $(GUTENPRINT_LIBS) $(GUTENPRINTUI2_LIBS) >+-print_DEPENDENCIES = $(GUTENPRINT_LIBS) $(GUTENPRINTUI2_LIBS) > +print_LDADD = $(GIMP2_LIBS) %%GUTENPRINTUI2_LIBS%% > +print_DEPENDENCIES = > gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 358473) >+++ pkg-plist (working copy) >@@ -30,7 +30,7 @@ > lib/libgutenprint.a > lib/libgutenprint.la > lib/libgutenprint.so >-lib/libgutenprint.so.3 >+lib/libgutenprint.so.5 > lib/libgutenprintui2.a > lib/libgutenprintui2.la > lib/libgutenprintui2.so >@@ -37,6 +37,7 @@ > lib/libgutenprintui2.so.1 > libdata/pkgconfig/gutenprint.pc > libdata/pkgconfig/gutenprintui2.pc >+man/man1/escputil.1.gz > %%DATADIR%%/5.2/xml/dither-matrix-1x1.xml > %%DATADIR%%/5.2/xml/dither-matrix-2x1.xml > %%DATADIR%%/5.2/xml/dither-matrix-4x1.xml >@@ -76,9 +77,11 @@ > %%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml > %%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k34.xml > %%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml >+%%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v10.xml > %%DATADIR%%/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml > %%DATADIR%%/5.2/xml/escp2/inks/standard.xml > %%DATADIR%%/5.2/xml/escp2/inks/standard_gen0.xml >+%%DATADIR%%/5.2/xml/escp2/inks/sx445.xml > %%DATADIR%%/5.2/xml/escp2/inks/ultrachrome.xml > %%DATADIR%%/5.2/xml/escp2/inks/wf40.xml > %%DATADIR%%/5.2/xml/escp2/inks/wf500.xml >@@ -90,6 +93,7 @@ > %%DATADIR%%/5.2/xml/escp2/inputslots/cd_roll_feed.xml > %%DATADIR%%/5.2/xml/escp2/inputslots/cutter_roll_feed.xml > %%DATADIR%%/5.2/xml/escp2/inputslots/default.xml >+%%DATADIR%%/5.2/xml/escp2/inputslots/default-duplex.xml > %%DATADIR%%/5.2/xml/escp2/inputslots/pro3880.xml > %%DATADIR%%/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml > %%DATADIR%%/5.2/xml/escp2/inputslots/pro_roll_feed.xml >@@ -100,6 +104,7 @@ > %%DATADIR%%/5.2/xml/escp2/inputslots/rx700.xml > %%DATADIR%%/5.2/xml/escp2/inputslots/spro5000.xml > %%DATADIR%%/5.2/xml/escp2/inputslots/standard_roll_feed.xml >+%%DATADIR%%/5.2/xml/escp2/inputslots/wf7000.xml > %%DATADIR%%/5.2/xml/escp2/media/artisan.xml > %%DATADIR%%/5.2/xml/escp2/media/b500.xml > %%DATADIR%%/5.2/xml/escp2/media/c120.xml >@@ -135,6 +140,7 @@ > %%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome.xml > %%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3.xml > %%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml >+%%DATADIR%%/5.2/xml/escp2/media/pro_ultrachrome_k3v10.xml > %%DATADIR%%/5.2/xml/escp2/media/r800.xml > %%DATADIR%%/5.2/xml/escp2/media/standard.xml > %%DATADIR%%/5.2/xml/escp2/media/standard_gen0.xml >@@ -164,7 +170,11 @@ > %%DATADIR%%/5.2/xml/escp2/model/model_115.xml > %%DATADIR%%/5.2/xml/escp2/model/model_116.xml > %%DATADIR%%/5.2/xml/escp2/model/model_117.xml >+%%DATADIR%%/5.2/xml/escp2/model/model_118.xml >+%%DATADIR%%/5.2/xml/escp2/model/model_119.xml > %%DATADIR%%/5.2/xml/escp2/model/model_12.xml >+%%DATADIR%%/5.2/xml/escp2/model/model_120.xml >+%%DATADIR%%/5.2/xml/escp2/model/model_121.xml > %%DATADIR%%/5.2/xml/escp2/model/model_13.xml > %%DATADIR%%/5.2/xml/escp2/model/model_14.xml > %%DATADIR%%/5.2/xml/escp2/model/model_15.xml >@@ -282,9 +292,9 @@ > %%DATADIR%%/doc/gutenprint-users-manual.pdf > %%DATADIR%%/doc/gutenprint.pdf > %%DATADIR%%/doc/reference-html/book1.html >-%%DATADIR%%/doc/reference-html/c1717.html >+%%DATADIR%%/doc/reference-html/c1715.html > %%DATADIR%%/doc/reference-html/c194.html >-%%DATADIR%%/doc/reference-html/c1968.html >+%%DATADIR%%/doc/reference-html/c1966.html > %%DATADIR%%/doc/reference-html/c200.html > %%DATADIR%%/doc/reference-html/c39.html > %%DATADIR%%/doc/reference-html/c464.html >@@ -294,17 +304,18 @@ > %%DATADIR%%/doc/reference-html/gpl-terms.html > %%DATADIR%%/doc/reference-html/gpl.html > %%DATADIR%%/doc/reference-html/ln10.html >-%%DATADIR%%/doc/reference-html/x1669.html >-%%DATADIR%%/doc/reference-html/x1734.html >+%%DATADIR%%/doc/reference-html/x1667.html >+%%DATADIR%%/doc/reference-html/x1732.html > %%DATADIR%%/doc/reference-html/x271.html > %%DATADIR%%/doc/reference-html/x67.html > %%DATADIR%%/doc/reference-html/x79.html >-%%DATADIR%%/doc/reference-html/x955.html >+%%DATADIR%%/doc/reference-html/x953.html > %%DATADIR%%/samples/colorbars4.png > %%DATADIR%%/samples/colorsweep.png > %%DATADIR%%/samples/extended.sample > %%DATADIR%%/samples/profile.jpg > %%DATADIR%%/samples/testpattern.sample >+share/locale/ca/LC_MESSAGES/gutenprint.mo > share/locale/cs/LC_MESSAGES/gutenprint.mo > share/locale/da/LC_MESSAGES/gutenprint.mo > share/locale/de/LC_MESSAGES/gutenprint.mo >@@ -325,7 +336,9 @@ > share/locale/sk/LC_MESSAGES/gutenprint.mo > share/locale/sl/LC_MESSAGES/gutenprint.mo > share/locale/sv/LC_MESSAGES/gutenprint.mo >+share/locale/tr/LC_MESSAGES/gutenprint.mo > share/locale/uk/LC_MESSAGES/gutenprint.mo >+share/locale/vi/LC_MESSAGES/gutenprint.mo > share/locale/zh_CN/LC_MESSAGES/gutenprint.mo > share/locale/zh_TW/LC_MESSAGES/gutenprint.mo > @dirrm %%DATADIR%%/samples >@@ -342,8 +355,8 @@ > @dirrm %%DATADIR%%/5.2/xml > @dirrm %%DATADIR%%/5.2 > @dirrm %%DATADIR%% >-@dirrm lib/gutenprint/5.2/modules >-@dirrm lib/gutenprint/5.2 >-@dirrm lib/gutenprint >+@dirrmtry lib/gutenprint/5.2/modules >+@dirrmtry lib/gutenprint/5.2 >+@dirrmtry lib/gutenprint > @dirrm include/gutenprintui2 > @dirrm include/gutenprint
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 191209
:
143963
|
143964
|
143965
|
143966
|
143967
|
143968
|
144695
|
144696
| 144697 |
144698
|
144699
|
144700
|
144885