Small update to gutenprint-5.2.4.

This commit is contained in:
ajacoutot 2009-08-27 11:11:04 +00:00
parent bf7f8d0f7d
commit 149eca9e15
6 changed files with 50 additions and 40 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.13 2009/08/10 06:34:08 kili Exp $
# $OpenBSD: Makefile,v 1.14 2009/08/27 11:11:04 ajacoutot Exp $
COMMENT-main= high quality print drivers
COMMENT-foomatic= Foomatic data for gutenprint drivers
COMMENT-gimp= Gimp print plug-in
V= 5.2.3
V= 5.2.4
DISTNAME= gutenprint-${V}
PKGNAME-main= ${DISTNAME}p1
PKGNAME-foomatic= foomatic-db-${DISTNAME}p0
PKGNAME-gimp= gutenprint-gimp-${V}p1
PKGNAME-main= ${DISTNAME}
PKGNAME-foomatic= foomatic-db-${DISTNAME}
PKGNAME-gimp= gutenprint-gimp-${V}
MAJOR_V= ${V:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= MAJOR_V
@ -87,6 +87,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-cups=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
LIBS="-liconv -lintl" \
am_cv_prog_tar_ustar=plaintar
.for i in DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN TEXI2HTML CONVERT

View File

@ -1,5 +1,5 @@
MD5 (gutenprint-5.2.3.tar.bz2) = TbJgVzmzy8b8crsWZXMa6w==
RMD160 (gutenprint-5.2.3.tar.bz2) = rm7fHeos2IVyc2vweEpDU7WecRM=
SHA1 (gutenprint-5.2.3.tar.bz2) = 5N2yFmVXiDXVgmfVm1fY2XDD7oY=
SHA256 (gutenprint-5.2.3.tar.bz2) = zQAVk8utc7wQLpoeydc2I23WJiaqsai0AlKSivZSL+8=
SIZE (gutenprint-5.2.3.tar.bz2) = 4929205
MD5 (gutenprint-5.2.4.tar.bz2) = Sw7MIPP8aOZ8dpkcyFFv5w==
RMD160 (gutenprint-5.2.4.tar.bz2) = xCz8hH04hsKimaMNvN9moRmigt4=
SHA1 (gutenprint-5.2.4.tar.bz2) = rmgDFGUN2aUt9f0RzQKCzG+WYuY=
SHA256 (gutenprint-5.2.4.tar.bz2) = thDoYwXvu5hpavIDZmlvBupAp7AwtF8hqDoUKJKrliY=
SIZE (gutenprint-5.2.4.tar.bz2) = 5119559

View File

@ -1,7 +1,21 @@
$OpenBSD: patch-configure,v 1.2 2009/03/23 17:17:33 ajacoutot Exp $
--- configure.orig Mon Dec 22 03:50:32 2008
+++ configure Sun Mar 22 12:44:50 2009
@@ -26682,7 +26682,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
$OpenBSD: patch-configure,v 1.3 2009/08/27 11:11:04 ajacoutot Exp $
--- configure.orig Sun Jul 26 22:36:34 2009
+++ configure Thu Aug 27 09:52:57 2009
@@ -12660,12 +12660,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
int
main ()
{
bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr
;
return 0;
}
@@ -18101,7 +18100,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
else
@ -9,18 +23,4 @@ $OpenBSD: patch-configure,v 1.2 2009/03/23 17:17:33 ajacoutot Exp $
+ for stp_ac_arg in '' ; do
stp_ac_save_CFLAGS="${CFLAGS}"
{ echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
@@ -32247,10 +32247,10 @@ XGETTEXT!$XGETTEXT$ac_delim
XGETTEXT_015!$XGETTEXT_015$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+INTLLIBS!$LTLIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
USE_NLS_TRUE!$USE_NLS_TRUE$ac_delim
{ $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2009/03/23 17:17:33 ajacoutot Exp $
--- doc/Makefile.in.orig Mon Dec 22 03:50:29 2008
+++ doc/Makefile.in Sun Mar 22 11:58:42 2009
@@ -236,7 +236,7 @@ cups_prefix = @cups_prefix@
$OpenBSD: patch-doc_Makefile_in,v 1.3 2009/08/27 11:11:04 ajacoutot Exp $
--- doc/Makefile.in.orig Sun Jul 26 22:36:30 2009
+++ doc/Makefile.in Thu Aug 27 09:47:03 2009
@@ -239,7 +239,7 @@ cups_prefix = @cups_prefix@
cups_sbindir = @cups_sbindir@
datadir = @datadir@
datarootdir = @datarootdir@
@ -10,7 +10,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 2009/03/23 17:17:33 ajacoutot Exp $
dvidir = @dvidir@
exec_prefix = @exec_prefix@
gimp2_plug_indir = @gimp2_plug_indir@
@@ -653,7 +653,6 @@ html:
@@ -658,7 +658,6 @@ html:
install-data-local: FAQ.html gutenprint-users-manual.odt gutenprint-users-manual.pdf
$(mkdir_p) $(DESTDIR)$(docdir)
$(INSTALL_DATA) $(srcdir)/FAQ.html $(DESTDIR)$(docdir)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_developer_Makefile_in,v 1.2 2009/03/23 17:17:33 ajacoutot Exp $
--- doc/developer/Makefile.in.orig Mon Dec 22 03:50:29 2008
+++ doc/developer/Makefile.in Sun Mar 22 11:58:42 2009
@@ -549,11 +549,11 @@ html-stamp: $(MANUAL_SRC_FILES)
$OpenBSD: patch-doc_developer_Makefile_in,v 1.3 2009/08/27 11:11:04 ajacoutot Exp $
--- doc/developer/Makefile.in.orig Sun Jul 26 22:36:30 2009
+++ doc/developer/Makefile.in Thu Aug 27 09:47:03 2009
@@ -554,11 +554,11 @@ html-stamp: $(MANUAL_SRC_FILES)
install-data-local: $(STANDARD_TARGETS)
if test -n '$(STANDARD_TARGETS)' ; then \
@ -16,7 +16,7 @@ $OpenBSD: patch-doc_developer_Makefile_in,v 1.2 2009/03/23 17:17:33 ajacoutot Ex
fi ; \
if test -d $(HTMLDIR) ; then \
HTMLGENDIR="$(HTMLDIR)" ; \
@@ -564,7 +564,7 @@ install-data-local: $(STANDARD_TARGETS)
@@ -569,7 +569,7 @@ install-data-local: $(STANDARD_TARGETS)
fi ; \
for file in $$HTMLGENDIR/*.html $$HTMLGENDIR/*.css ; do \
if test -f $$file ; then \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2009/03/23 17:17:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2009/08/27 11:11:04 ajacoutot Exp $
%%SHARED%%
@bin bin/escputil
@bin bin/ijsgutenprint.${MAJOR_V}
@ -98,6 +98,7 @@ share/gutenprint/${MAJOR_V}/xml/escp2/inks/f360_photo.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inks/f360_photo7_japan.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inks/f360_ultrachrome.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inks/f360_ultrachrome_k3.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inks/f360_ultrachrome_k3v.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inks/nx100.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inks/photo_gen0.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inks/photo_gen1.xml
@ -129,11 +130,13 @@ share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/default.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/pro_roll_feed.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/r1800.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/r2400.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/r2880.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/rx680.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/rx700.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/spro5000.xml
share/gutenprint/${MAJOR_V}/xml/escp2/inputslots/standard_roll_feed.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/
share/gutenprint/${MAJOR_V}/xml/escp2/media/artisan.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/b500.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/c120.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/c64.xml
@ -150,6 +153,7 @@ share/gutenprint/${MAJOR_V}/xml/escp2/media/f360_photo.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/f360_photo7_japan.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/f360_ultrachrome.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/f360_ultrachrome_k3.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/f360_ultrachrome_k3v.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/nx100.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/photo_gen0.xml
share/gutenprint/${MAJOR_V}/xml/escp2/media/photo_gen1.xml
@ -272,6 +276,7 @@ share/gutenprint/${MAJOR_V}/xml/escp2/model/model_94.xml
share/gutenprint/${MAJOR_V}/xml/escp2/model/model_95.xml
share/gutenprint/${MAJOR_V}/xml/escp2/model/model_96.xml
share/gutenprint/${MAJOR_V}/xml/escp2/model/model_97.xml
share/gutenprint/${MAJOR_V}/xml/escp2/model/model_98.xml
share/gutenprint/${MAJOR_V}/xml/escp2/qualitypresets/
share/gutenprint/${MAJOR_V}/xml/escp2/qualitypresets/p1_5.xml
share/gutenprint/${MAJOR_V}/xml/escp2/qualitypresets/picturemate.xml
@ -348,6 +353,10 @@ share/locale/pt/
share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/gutenprint.mo
share/locale/pt/gutenprint_pt.po
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/gutenprint.mo
share/locale/ru/gutenprint_ru.po
share/locale/sk/
share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/gutenprint.mo