[Midnightbsd-cvs] mports [17177] trunk/print/gutenprint-base: 5.2.10

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 14 22:19:10 EDT 2014


Revision: 17177
          http://svnweb.midnightbsd.org/mports/?rev=17177
Author:   laffer1
Date:     2014-09-14 22:19:09 -0400 (Sun, 14 Sep 2014)
Log Message:
-----------
 5.2.10

Modified Paths:
--------------
    trunk/print/gutenprint-base/Makefile
    trunk/print/gutenprint-base/distinfo
    trunk/print/gutenprint-base/pkg-plist

Added Paths:
-----------
    trunk/print/gutenprint-base/files/patch-src__gimp2__Makefile.in
    trunk/print/gutenprint-base/files/patch-src__main__print-olympus.c

Removed Paths:
-------------
    trunk/print/gutenprint-base/files/patch-src_cups_commandtocanon.c
    trunk/print/gutenprint-base/files/patch-src_cups_commandtoepson.c
    trunk/print/gutenprint-base/files/patch-src_gimp2_Makefile.in

Modified: trunk/print/gutenprint-base/Makefile
===================================================================
--- trunk/print/gutenprint-base/Makefile	2014-09-15 02:16:02 UTC (rev 17176)
+++ trunk/print/gutenprint-base/Makefile	2014-09-15 02:19:09 UTC (rev 17177)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME?=	gutenprint
-PORTVERSION=	5.2.7
+PORTVERSION=	5.2.10
 CATEGORIES=	print
 MASTER_SITES=	SF/gimp-print/gutenprint-5.2/${PORTVERSION}
 PKGNAMESUFFIX?=	-base
@@ -8,13 +8,12 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GutenPrint Printer Driver
+
 LICENSE=	gpl2
 
 CONFLICTS=	gimp-print-[0-9]*
 
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomehack gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
@@ -30,7 +29,6 @@
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
 .else
-MAN1+=		escputil.1
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
@@ -50,7 +48,6 @@
 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
@@ -60,7 +57,6 @@
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="ijs"
 LIB_DEPENDS+=	ijs.1:${PORTSDIR}/print/libijs
 CONFIGURE_ARGS+=--with-ijs=yes
-MAN1+=		ijsgutenprint.1
 BUILD_WRKSRC=	${WRKSRC}/src/ghost
 INSTALL_WRKSRC=	${WRKSRC}/src/ghost
 .else
@@ -78,10 +74,6 @@
 CONFIGURE_ARGS+=--without-foomatic
 .endif
 
-.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--with-user-guide=no
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/lpstat|${LOCALBASE}/bin/lpstat|' \
 		${WRKSRC}/src/gutenprintui2/plist.c

Modified: trunk/print/gutenprint-base/distinfo
===================================================================
--- trunk/print/gutenprint-base/distinfo	2014-09-15 02:16:02 UTC (rev 17176)
+++ trunk/print/gutenprint-base/distinfo	2014-09-15 02:19:09 UTC (rev 17177)
@@ -1,3 +1,2 @@
-SHA256 (gutenprint-5.2.7.tar.bz2) = 114c899227e3ebb0753c1db503e6a5c1afaa4b1f1235fdfe02fb6bbd533beed1
-RMD160 (gutenprint-5.2.7.tar.bz2) = 63c6dbc136ac7095c06accf48979a379a923b7de
-SIZE (gutenprint-5.2.7.tar.bz2) = 5498414
+SHA256 (gutenprint-5.2.10.tar.bz2) = 431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59
+SIZE (gutenprint-5.2.10.tar.bz2) = 6241585

Added: trunk/print/gutenprint-base/files/patch-src__gimp2__Makefile.in
===================================================================
--- trunk/print/gutenprint-base/files/patch-src__gimp2__Makefile.in	                        (rev 0)
+++ trunk/print/gutenprint-base/files/patch-src__gimp2__Makefile.in	2014-09-15 02:19:09 UTC (rev 17177)
@@ -0,0 +1,13 @@
+--- 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) $(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
+ gutenprint_LDADD = $(print_LDADD)
+ gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)

Added: trunk/print/gutenprint-base/files/patch-src__main__print-olympus.c
===================================================================
--- trunk/print/gutenprint-base/files/patch-src__main__print-olympus.c	                        (rev 0)
+++ trunk/print/gutenprint-base/files/patch-src__main__print-olympus.c	2014-09-15 02:19:09 UTC (rev 17177)
@@ -0,0 +1,19 @@
+--- ./src/main/print-olympus.c.orig	2014-05-14 22:18:36.000000000 -0300
++++ ./src/main/print-olympus.c	2014-07-22 15:47:50.000000000 -0300
+@@ -4901,13 +4901,13 @@
+   }
+ 
+   if (pv.bytes_per_ink_channel > 1) {
+-#if defined(__LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__)
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+     pv.byteswap = dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN);
+-#elif defined (__BIG_ENDIAN) || defined(__BIG_ENDIAN__)
++#elif __BYTE_ORDER == __BIG_ENDIAN
+     pv.byteswap = !dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN);
+ #else
+ #error "Unable to determine endianness, aborting compilation!"
+-#endif    
++#endif
+   }
+ 
+   pv.image_data = dyesub_read_image(v, &pv, image);

Deleted: trunk/print/gutenprint-base/files/patch-src_cups_commandtocanon.c
===================================================================
--- trunk/print/gutenprint-base/files/patch-src_cups_commandtocanon.c	2014-09-15 02:16:02 UTC (rev 17176)
+++ trunk/print/gutenprint-base/files/patch-src_cups_commandtocanon.c	2014-09-15 02:19:09 UTC (rev 17177)
@@ -1,10 +0,0 @@
---- src/cups/commandtocanon.c.orig	2011-10-15 13:27:57.000000000 +0200
-+++ src/cups/commandtocanon.c	2011-10-15 13:28:22.000000000 +0200
-@@ -13,6 +13,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- 
- 

Deleted: trunk/print/gutenprint-base/files/patch-src_cups_commandtoepson.c
===================================================================
--- trunk/print/gutenprint-base/files/patch-src_cups_commandtoepson.c	2014-09-15 02:16:02 UTC (rev 17176)
+++ trunk/print/gutenprint-base/files/patch-src_cups_commandtoepson.c	2014-09-15 02:19:09 UTC (rev 17177)
@@ -1,10 +0,0 @@
---- src/cups/commandtoepson.c.orig	2011-10-15 13:20:46.000000000 +0200
-+++ src/cups/commandtoepson.c	2011-10-15 13:20:57.000000000 +0200
-@@ -30,6 +30,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- 

Deleted: trunk/print/gutenprint-base/files/patch-src_gimp2_Makefile.in
===================================================================
--- trunk/print/gutenprint-base/files/patch-src_gimp2_Makefile.in	2014-09-15 02:16:02 UTC (rev 17176)
+++ trunk/print/gutenprint-base/files/patch-src_gimp2_Makefile.in	2014-09-15 02:19:09 UTC (rev 17177)
@@ -1,13 +0,0 @@
---- 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 @@
- 	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) %%GUTENPRINTUI2_LIBS%%
-+print_DEPENDENCIES =
- gutenprint_SOURCES = $(COMMON_PRINT_SOURCES) print-gutenprint.c
- gutenprint_LDADD = $(print_LDADD)
- gutenprint_DEPENDENCIES = $(print_DEPENDENCIES)

Modified: trunk/print/gutenprint-base/pkg-plist
===================================================================
--- trunk/print/gutenprint-base/pkg-plist	2014-09-15 02:16:02 UTC (rev 17176)
+++ trunk/print/gutenprint-base/pkg-plist	2014-09-15 02:19:09 UTC (rev 17177)
@@ -27,16 +27,17 @@
 include/gutenprintui2/gammacurve.h
 include/gutenprintui2/gutenprintui.h
 include/gutenprintui2/typebuiltins.h
+lib/libgutenprint.so.2
+lib/libgutenprint.so.2.3.0
+lib/libgutenprintui2.so.1.0.0
 lib/libgutenprint.a
-lib/libgutenprint.la
 lib/libgutenprint.so
-lib/libgutenprint.so.2
 lib/libgutenprintui2.a
-lib/libgutenprintui2.la
 lib/libgutenprintui2.so
 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
@@ -162,7 +168,13 @@
 %%DATADIR%%/5.2/xml/escp2/model/model_113.xml
 %%DATADIR%%/5.2/xml/escp2/model/model_114.xml
 %%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
@@ -260,6 +272,7 @@
 %%DATADIR%%/5.2/xml/escp2/model/model_99.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/p1_5.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/picturemate.xml
+%%DATADIR%%/5.2/xml/escp2/qualitypresets/prox900.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/standard.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/v2880.xml
 %%DATADIR%%/5.2/xml/escp2/qualitypresets/wf40.xml
@@ -279,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
@@ -291,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
@@ -310,6 +324,7 @@
 share/locale/es/LC_MESSAGES/gutenprint.mo
 share/locale/fi/LC_MESSAGES/gutenprint.mo
 share/locale/fr/LC_MESSAGES/gutenprint.mo
+share/locale/gl/LC_MESSAGES/gutenprint.mo
 share/locale/hu/LC_MESSAGES/gutenprint.mo
 share/locale/it/LC_MESSAGES/gutenprint.mo
 share/locale/ja/LC_MESSAGES/gutenprint.mo
@@ -321,6 +336,10 @@
 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
 @dirrm %%DATADIR%%/doc/reference-html
@@ -336,10 +355,8 @@
 @dirrm %%DATADIR%%/5.2/xml
 @dirrm %%DATADIR%%/5.2
 @dirrm %%DATADIR%%
- at dirrm lib/gutenprint/5.2/modules
- at dirrm lib/gutenprint/5.2
- at dirrm lib/gutenprint
+ at dirrmtry lib/gutenprint/5.2/modules
+ at dirrmtry lib/gutenprint/5.2
+ at dirrmtry lib/gutenprint
 @dirrm include/gutenprintui2
 @dirrm include/gutenprint
- at dirrmtry libexec/cups/driver
- at dirrmtry libexec/cups



More information about the Midnightbsd-cvs mailing list