Remove the -gimp subpackage. It had a meaning when gimp did not provide

a sensible printing interface but this is not the case anymore. This
also allows to remove gutenprintui2 and gtk+2 dependency.

Rebuild -foomatic against the latest foomatic-db-engine.
The -foomatic package run_depends on foomatic-db. Move some files from
-main to -foomatic.
This commit is contained in:
ajacoutot 2009-12-10 11:04:35 +00:00
parent 0ee6f3255c
commit 4ec7c40b92
9 changed files with 57 additions and 85 deletions

View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.14 2009/08/27 11:11:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2009/12/10 11:04:35 ajacoutot Exp $
COMMENT-main= high quality print drivers
COMMENT-foomatic= Foomatic data for gutenprint drivers
COMMENT-gimp= Gimp print plug-in
V= 5.2.4
DISTNAME= gutenprint-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-foomatic= foomatic-db-${DISTNAME}
PKGNAME-gimp= gutenprint-gimp-${V}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-foomatic= foomatic-db-${DISTNAME}p0
MAJOR_V= ${V:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= MAJOR_V
@ -18,7 +16,6 @@ CATEGORIES= print
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS+= gutenprint 1.0 # .2.3
SHARED_LIBS+= gutenprintui2 1.0 # .1.0
HOMEPAGE= http://gimp-print.sourceforge.net/
@ -32,43 +29,20 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
PSEUDO_FLAVORS= no_foomatic no_gimp
FLAVOR?=
MULTI_PACKAGES= -main
MULTI_PACKAGES= -main -foomatic
.if !${FLAVOR:L:Mno_foomatic}
MULTI_PACKAGES+= -foomatic
CONFIGURE_ARGS+= --with-foomatic3
BUILD_DEPENDS+= ::print/foomatic-db-engine
.else
CONFIGURE_ARGS+= --without-foomatic
.endif
MODULES= devel/gettext
.if !${FLAVOR:L:Mno_gimp}
MULTI_PACKAGES+= -gimp
CONFIGURE_ARGS+= --with-gimp2-as-gutenprint \
--with-gimp2
.else
CONFIGURE_ARGS+= --without-gimp2
.endif
WANTLIB += c m
WANTLIB-main += ${WANTLIB} ncurses readline
WANTLIB-foomatic += ${WANTLIB}
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread-stubs xcb z
BUILD_DEPENDS= :foomatic-db-engine->=4.0.3:print/foomatic-db-engine
WANTLIB-main= ${WANTLIB} ncurses readline
WANTLIB-foomatic=
WANTLIB-gimp= ${WANTLIB} gdk-x11-2.0 gdk_pixbuf-2.0 gthread-2.0 \
gtk-x11-2.0 pthread
LIB_DEPENDS-main= ijs::print/ijs \
gdk-x11-2.0.>=802,gdk_pixbuf-2.0.>=802,gtk-x11-2.0.>=802::x11/gtk+2
LIB_DEPENDS-gimp= gutenprint,gutenprintui2::${BUILD_PKGPATH} \
gimp-2.0,gimpbase-2.0,gimpcolor-2.0,gimpconfig-2.0,gimpmath-2.0,gimpmodule-2.0,gimpui-2.0,gimpwidgets-2.0::graphics/gimp/stable
RUN_DEPENDS-main= ::print/ghostscript/gnu
RUN_DEPENDS-foomatic= ::${BUILD_PKGPATH}
LIB_DEPENDS-foomatic= ${MODGETTEXT_LIB_DEPENDS} \
gutenprint.>=1::${BUILD_PKGPATH},-main \
ijs::print/ijs
RUN_DEPENDS-foomatic= ::print/foomatic-db
USE_X11= Yes
USE_GMAKE= Yes
@ -79,12 +53,13 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-static \
--enable-test \
--enable-testpattern \
--enable-libgutenprintui2 \
--enable-escputil \
--disable-libgutenprintui2 \
--with-foomatic \
--with-foomatic3 \
--with-ghostscript \
--with-cups=no
--with-cups=no \
--without-gimp2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
LIBS="-liconv -lintl" \
@ -94,8 +69,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV+= ac_cv_path_$i=""
.endfor
PKG_ARCH-foomatic= *
FAKE_FLAGS= docdir=${PREFIX}/share/doc/gutenprint
pre-configure:

View File

@ -3,3 +3,6 @@ quality drivers for Canon, Epson, Lexmark and PCL printers.
This package contains gutenprint driver information for creating PPD
files with the foomatic-db-engine package. The PPD files can be used
with foomatic-rip and/or CUPS print filters.
The 'gutenprint' CUPS driver is not provided on OpenBSD but instead the
gutenprint-ijs.${MAJOR_V} which is spooler independent (uses foomatic).

View File

@ -1,4 +0,0 @@
Gutenprint, formerly known as gimp-print, is a project to provide high
quality drivers for Canon, Epson, Lexmark and PCL printers.
This package contains an enhanced print plug-in for the GIMP image
editor.

View File

@ -1,15 +0,0 @@
This package only installs the gutenprint data for Foomatic, not the
PPD files. PPD files can be created using foomatic-ppdfile(1) from the
foomatic-db-engine package as in the following example for an Epson
Stylus C64:
% foomatic-ppdfile -P C64
Epson Stylus C64 Id='Epson-Stylus_C64' Driver='gutenprint' CompatibleDrivers='gutenprint gutenprint-ijs-simplified.${MAJOR_V} gutenprint-ijs.${MAJOR_V}'
% foomatic-ppdfile -p 'Epson-Stylus_C64' -d 'gutenprint-ijs.${MAJOR_V}' > C64.ppd
C64.ppd can then be used with CUPS or with lpd(8) and foomatic-rip(1) as
the input filter.
Note that the 'gutenprint' driver must be compiled into Ghostscript to
work; as this is not the case under OpenBSD, you're advised to use the
ijs driver which will communicate with Ghostscript using libijs.

View File

@ -1,5 +0,0 @@
This package only contains the gutenprint libraries and ijs driver. To
use gutenprint with your favorite spooler, install the corresponding
package(s):
* foomatic (lpr, cups, LPRng) -> foomatic-db-gutenprint
* gimp (print plugin) -> gutenprint-gimp

View File

@ -1,3 +1,2 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2007/10/01 10:32:57 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2009/12/10 11:04:35 ajacoutot Exp $
@lib lib/libgutenprint.so.${LIBgutenprint_VERSION}
@lib lib/libgutenprintui2.so.${LIBgutenprintui2_VERSION}

View File

@ -1,4 +1,7 @@
@comment $OpenBSD: PLIST-foomatic,v 1.3 2009/03/23 17:17:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-foomatic,v 1.4 2009/12/10 11:04:35 ajacoutot Exp $
@conflict gutenprint-<5.2.4p0
@bin bin/ijsgutenprint.${MAJOR_V}
@man man/man1/ijsgutenprint.1
share/foomatic/
share/foomatic/db/
share/foomatic/db/source/
@ -93,6 +96,21 @@ share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablegray3value.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablegrayscale.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablegraytrans.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablegrayvalue.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray1scale.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray1trans.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray1value.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray2scale.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray2trans.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray2value.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray3scale.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray3trans.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray3value.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray4scale.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray4trans.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray4value.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray5scale.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray5trans.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablehgray5value.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enableinklimit.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablelightcyanscale.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablelightcyantrans.xml
@ -111,6 +129,7 @@ share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enableorangedensity.x
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablepaperthickness.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enableplatengap.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enableprintmethod.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablequalityenhancement.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablereddensity.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enablevacuumintensity.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_enableyellowbalance.xml
@ -135,6 +154,21 @@ share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_gray3value-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_grayscale-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_graytrans-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_grayvalue-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray1scale-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray1trans-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray1value-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray2scale-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray2trans-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray2value-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray3scale-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray3trans-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray3value-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray4scale-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray4trans-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray4value-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray5scale-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray5trans-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_hgray5value-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_imagetype.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_inklimit-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_inklimit-2.xml
@ -169,6 +203,7 @@ share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_platengap-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_printingdirection.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_printmethod-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_quality.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_qualityenhancement-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_reddensity-1.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_resolution.xml
share/foomatic/db/source/opt/gutenprint-ijs.${MAJOR_V}-stp_usegloss.xml

View File

@ -1,5 +0,0 @@
@comment $OpenBSD: PLIST-gimp,v 1.2 2008/07/27 00:05:25 jakemsr Exp $
lib/gimp/
lib/gimp/2.0/
lib/gimp/2.0/plug-ins/
@bin lib/gimp/2.0/plug-ins/gutenprint

View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.5 2009/08/27 11:11:04 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2009/12/10 11:04:35 ajacoutot Exp $
%%SHARED%%
@bin bin/escputil
@bin bin/ijsgutenprint.${MAJOR_V}
@bin bin/testpattern
include/gutenprint/
include/gutenprint/array.h
@ -28,22 +27,14 @@ include/gutenprint/vars.h
include/gutenprint/weave.h
include/gutenprint/xml.h
include/gutenprintui2/
include/gutenprintui2/curve.h
include/gutenprintui2/gammacurve.h
include/gutenprintui2/gutenprintui.h
include/gutenprintui2/typebuiltins.h
lib/gutenprint/
lib/gutenprint/${MAJOR_V}/
lib/gutenprint/${MAJOR_V}/modules/
lib/libgutenprint.a
lib/libgutenprint.la
lib/libgutenprintui2.a
lib/libgutenprintui2.la
lib/pkgconfig/
lib/pkgconfig/gutenprint.pc
lib/pkgconfig/gutenprintui2.pc
@man man/man1/escputil.1
@man man/man1/ijsgutenprint.1
share/doc/gutenprint/
share/doc/gutenprint/AUTHORS
share/doc/gutenprint/COPYING