cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to foomatic-db-engine-3.0.20070919 for better support of newer

Browse Source 
PPDs (also resolve a parsing bug on powerpc)
- use a saner version number
- fix default libdir

ok jakemsr@
This commit is contained in:
ajacoutot 2007-09-26 08:25:34 +00:00
parent 80b8e36a57
commit 564932b702
7 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
print/foomatic-db-engine/Makefile
View File

@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2007/09/26 08:25:34 ajacoutot Exp $
COMMENT= Foomatic PPD generator
DISTNAME= foomatic-db-engine-3.0.2
V= 20070919
DISTNAME= foomatic-db-engine-3.0-${V}
PKGNAME= foomatic-db-engine-3.0.${V}
CATEGORIES= print
HOMEPAGE= http://www.linux-foundation.org/en/OpenPrinting/Database/Foomatic
@ -15,7 +17,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.linuxprinting.org/download/foomatic/
# tarballs are only available for a 24 hour period
#MASTER_SITES= http://www.linuxprinting.org/download/foomatic/
MASTER_SITES= http://jakemsr.trancell.org/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
http://www.obsd.fr/OpenBSD/distfiles/
LIB_DEPENDS= xml2.>=8::textproc/libxml
BUILD_DEPENDS= ::print/foomatic-filters
@ -69,5 +75,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2"
CUPS_LPINFO="${LOCALBASE}/sbin/lpinfo"
NO_REGRESS= Yes
SUBST_VARS= LOCALBASE
pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
${WRKSRC}/foomatic-combo-xml.c
.include <bsd.port.mk>

10
print/foomatic-db-engine/distinfo
View File

@ -1,5 +1,5 @@
MD5 (foomatic-db-engine-3.0.2.tar.gz) = MGG40/eHBGfm++ro1DmSEQ==
RMD160 (foomatic-db-engine-3.0.2.tar.gz) = cWDOmJ6AyECQ7MrEs/sAUhFqJYw=
SHA1 (foomatic-db-engine-3.0.2.tar.gz) = bD0ijP59aY5jV1tjEatIXr58PmE=
SHA256 (foomatic-db-engine-3.0.2.tar.gz) = 1AcOxInTR4EFabxqn2KJvjtU6kKv6hgRbA4GvxbkGjw=
SIZE (foomatic-db-engine-3.0.2.tar.gz) = 286367
MD5 (foomatic-db-engine-3.0-20070919.tar.gz) = kysz8+eHyJUiAPKKUcLYoA==
RMD160 (foomatic-db-engine-3.0-20070919.tar.gz) = 2LrJ0lNULHscxacV9cUsJPJuO8M=
SHA1 (foomatic-db-engine-3.0-20070919.tar.gz) = XJ5XttExr8/cY9vl+I2a66wbNeY=
SHA256 (foomatic-db-engine-3.0-20070919.tar.gz) = e9VBKLC578ABoRmjHX4X0WONdGKaPcumNbQVuUuMtvk=
SIZE (foomatic-db-engine-3.0-20070919.tar.gz) = 331480

26
print/foomatic-db-engine/patches/patch-Makefile_in
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
--- Makefile.in.orig Sat Dec 20 02:01:43 2003
+++ Makefile.in Thu Apr 26 18:03:07 2007
@@ -182,13 +182,9 @@ check-config:
$OpenBSD: patch-Makefile_in,v 1.2 2007/09/26 08:25:34 ajacoutot Exp $
--- Makefile.in.orig Wed Sep 19 21:49:48 2007
+++ Makefile.in Tue Sep 25 12:47:05 2007
@@ -186,13 +186,9 @@ check-config:
install-bin: check-config lib/Makefile
# This is the only way to get the Perl-generated Makefile using
# $(DESTDIR) properly
- ( cd lib && \
- $(MAKE) PREFIX=$(PERLPREFIX) && \
- $(MAKE) PREFIX=$(PERLPREFIX) pure_install \
- $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
- )
+ cd lib && $(MAKE) PREFIX=$(PERLPREFIX) pure_install
${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
@ -16,7 +16,21 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
${SRC}/mkinstalldirs $(DESTDIR)$(LIBDIR)/templates
${INSTALL} -m 755 $(BINFILES) $(DESTDIR)$(BINDIR)
${INSTALL} -m 755 $(SBINFILES) $(DESTDIR)$(SBINDIR)
@@ -214,6 +210,7 @@ build: defaults lib/Makefile foomatic-combo-xml foomat
@@ -203,13 +199,6 @@ install-bin: check-config lib/Makefile
# Link to allow foomatic-ppdfile be called under the old name
# foomatic-datafile
ln -sf foomatic-ppdfile $(DESTDIR)$(BINDIR)/foomatic-datafile
-# Link foomatic-ppdfile to the CUPS 1.2 PPD generator directory,
-# so that the cups-driverd automatically generates Foomatic PPDs
-# on demand (/usr/lib/cups/driver).
- if [ -d $(LIB_CUPS) ]; then \
- ${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_DRIVER); \
- ln -sf $(BINDIR)/foomatic-ppdfile $(DESTDIR)$(CUPS_DRIVER)/foomatic; \
- fi
install-man: check-config
${SRC}/mkinstalldirs $(DESTDIR)$(MANDIR)
@@ -225,6 +214,7 @@ build: defaults lib/Makefile foomatic-combo-xml foomat
$(PERL) -p -i -e "s=use lib '.*lib/';\n==s" $$m; \
done
chmod a+rx $(AC_OUTPUT_FILES) mkinstalldirs

20
print/foomatic-db-engine/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
--- configure.orig Tue Sep 14 23:27:41 2004
+++ configure Thu Apr 26 18:00:11 2007
@@ -1828,13 +1828,13 @@ else
$OpenBSD: patch-configure,v 1.2 2007/09/26 08:25:34 ajacoutot Exp $
--- configure.orig Wed Sep 19 21:49:51 2007
+++ configure Tue Sep 25 12:29:50 2007
@@ -3860,13 +3860,13 @@ else
PREFIX=$prefix
fi
echo -n Checking whether Perl will find libraries installed under $PREFIX...
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
PERLPREFIX=/usr/local
echo " yes"
echo Installing the Perl libraries with prefix /usr/local.
@@ -3124,7 +3124,7 @@ test -n "$CUPS_LPINFO" && break
@@ -5313,7 +5313,7 @@ fi
done
test -n "$CUPS_LPINFO" || CUPS_LPINFO="/usr/sbin/lpinfo"
@ -26,8 +26,8 @@ $OpenBSD: patch-configure,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
for ac_dir in pdq
do
# Extract the first word of "$ac_dir", so it can be a program name with args.
@@ -3247,8 +3247,9 @@ fi
test -n "$PDQ_PRINT" && break
@@ -5446,8 +5446,9 @@ fi
test -n "$PDQ_PRINT" && break
done
test -n "$PDQ_PRINT" || PDQ_PRINT="/usr/bin/pdq"
+fi # with_pdq = yes
@ -36,9 +36,9 @@ $OpenBSD: patch-configure,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
+if [ x"$with_ppr" = x"yes" ]; then
for ac_prog in ppr/bin/pprd
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3535,7 +3536,7 @@ fi
test -n "$PPR_PPOP" && break
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5756,7 +5757,7 @@ fi
test -n "$PPR_PPOP" && break
done
test -n "$PPR_PPOP" || PPR_PPOP="/usr/bin/ppop"
-

12
print/foomatic-db-engine/patches/patch-foomatic-combo-xml_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-foomatic-combo-xml_c,v 1.1 2007/09/26 08:25:34 ajacoutot Exp $
--- foomatic-combo-xml.c.orig Tue Sep 25 12:38:18 2007
+++ foomatic-combo-xml.c Tue Sep 25 12:38:49 2007
@@ -1930,7 +1930,7 @@ main(int argc, /* I - Number of command-line argu
/* Set libdir to the default if empty */
if (libdir == NULL)
- libdir = "/usr/share/foomatic";
+ libdir = "!!LOCALBASE!!/share/foomatic";
/* Load translation table for old printer IDs */
sprintf(oldidfilename, "%s/db/oldprinterids",

5
print/foomatic-db-engine/pkg/MESSAGE Normal file
View File

@ -0,0 +1,5 @@
If you use CUPS and want it to generate Foomatic PPDs on demand, create
a symlink from foomatic-ppdfile(1) to the CUPS PPD generator directory:
# ln -sf ${PREFIX}/bin/foomatic-ppdfile \
${LOCALBASE}/libexec/cups/driver/foomatic

7
print/foomatic-db-engine/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/09/09 14:42:02 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2007/09/26 08:25:34 ajacoutot Exp $
bin/foomatic-combo-xml
bin/foomatic-compiledb
bin/foomatic-configure
@ -7,6 +7,7 @@ bin/foomatic-perl-data
bin/foomatic-ppd-options
bin/foomatic-ppdfile
bin/foomatic-printjob
bin/foomatic-searchprinter
libdata/perl5/site_perl/Foomatic/
libdata/perl5/site_perl/Foomatic/DB.pm
libdata/perl5/site_perl/Foomatic/Defaults.pm
@ -24,12 +25,14 @@ libdata/perl5/site_perl/Foomatic/UIElem.pm
@man man/man8/foomatic-kitload.8
@man man/man8/foomatic-preferred-driver.8
sbin/foomatic-addpjloptions
sbin/foomatic-cleanupdrivers
sbin/foomatic-extract-text
sbin/foomatic-fix-xml
sbin/foomatic-getpjloptions
sbin/foomatic-kitload
sbin/foomatic-nonumericalids
sbin/foomatic-preferred-driver
sbin/foomatic-printermap-to-gimp-print-xml
sbin/foomatic-printermap-to-gutenprint-xml
sbin/foomatic-replaceoldprinterids
share/foomatic/templates/
share/foomatic/templates/pjl_enum_choice.xml