summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/gimp-print-cups/Makefile6
-rw-r--r--print/gimp-print-cups/distinfo6
-rw-r--r--print/gimp-print-escputil/Makefile11
-rw-r--r--print/gimp-print-escputil/distinfo6
-rw-r--r--print/gimp-print-ijs/Makefile6
-rw-r--r--print/gimp-print-ijs/distinfo6
-rw-r--r--print/gimp-print-lib/Makefile6
-rw-r--r--print/gimp-print-lib/PLIST6
-rw-r--r--print/gimp-print-lib/buildlink2.mk4
-rw-r--r--print/gimp-print-lib/distinfo8
-rw-r--r--print/gimp-print-lib/patches/patch-ab8
-rw-r--r--print/gimp-print/Makefile4
-rw-r--r--print/gimp-print/distinfo7
-rw-r--r--print/gimp-print/patches/patch-ac13
14 files changed, 57 insertions, 40 deletions
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index c4e08cc61fe..a348f1ef632 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/11/27 16:12:35 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2003/04/23 17:33:00 drochner Exp $
#
-DISTNAME= gimp-print-4.2.4
-PKGNAME= gimp-print-cups-4.2.4
+DISTNAME= gimp-print-4.2.5
+PKGNAME= gimp-print-cups-4.2.5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
diff --git a/print/gimp-print-cups/distinfo b/print/gimp-print-cups/distinfo
index 99b4ad7b5a6..755b3d438e5 100644
--- a/print/gimp-print-cups/distinfo
+++ b/print/gimp-print-cups/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/11/27 16:12:35 drochner Exp $
+$NetBSD: distinfo,v 1.5 2003/04/23 17:33:00 drochner Exp $
-SHA1 (gimp-print-4.2.4.tar.gz) = d93e7abff8f968e9aa631ead0987d702f012d9fc
-Size (gimp-print-4.2.4.tar.gz) = 4938844 bytes
+SHA1 (gimp-print-4.2.5.tar.gz) = d1c25aed4412837888cf24be3e8b4aed8a407a49
+Size (gimp-print-4.2.5.tar.gz) = 4992416 bytes
SHA1 (patch-ab) = 9ed732e755223fcf6cdb87b8d06a29bd834095a8
SHA1 (patch-ac) = cd9ba17a9f64ee4a64e1f3136b463ea09818ae8c
SHA1 (patch-ad) = e1eacfff8fc134fdbf9098897c4473d3330761a4
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index a897bdfa547..983c13365f6 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/11/27 16:12:36 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/23 17:33:00 drochner Exp $
#
-DISTNAME= gimp-print-4.2.4
-PKGNAME= gimp-print-escputil-4.2.4
+DISTNAME= gimp-print-4.2.5
+PKGNAME= gimp-print-escputil-4.2.5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
@@ -10,7 +10,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= Epson Stylus inkjet printer tool
-BUILD_DEPENDS+= gimp-print-lib-*:../../print/gimp-print-lib
+#the lib is not really needed, but the build system wants it
+BUILDLINK_DEPMETHOD.gimp-print-lib= build
CONFLICTS+= gimp<=1.2.3
GNU_CONFIGURE= YES
@@ -21,5 +22,7 @@ CONFIGURE_ARGS+= --enable-libgimpprint=no
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_GMAKE= yes
+USE_BUILDLINK2= yes
+.include "../../print/gimp-print-lib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-escputil/distinfo b/print/gimp-print-escputil/distinfo
index 573532ab911..91092c65459 100644
--- a/print/gimp-print-escputil/distinfo
+++ b/print/gimp-print-escputil/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/11/27 16:12:36 drochner Exp $
+$NetBSD: distinfo,v 1.7 2003/04/23 17:33:00 drochner Exp $
-SHA1 (gimp-print-4.2.4.tar.gz) = d93e7abff8f968e9aa631ead0987d702f012d9fc
-Size (gimp-print-4.2.4.tar.gz) = 4938844 bytes
+SHA1 (gimp-print-4.2.5.tar.gz) = d1c25aed4412837888cf24be3e8b4aed8a407a49
+Size (gimp-print-4.2.5.tar.gz) = 4992416 bytes
SHA1 (patch-aa) = 9ed732e755223fcf6cdb87b8d06a29bd834095a8
SHA1 (patch-ab) = aa856c2f622be592b6f8341c81431b0ad7ccbcc4
SHA1 (patch-ac) = 2e7c114dd67e21b861bac405cc1a665460e66867
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index 1f8f116f56c..312a24c334d 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/12/10 18:39:49 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/23 17:33:00 drochner Exp $
-DISTNAME= gimp-print-4.2.4
-PKGNAME= gimp-print-ijs-4.2.4
+DISTNAME= gimp-print-4.2.5
+PKGNAME= gimp-print-ijs-4.2.5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITES_SOURCEFORGE:=gimp-print/}
diff --git a/print/gimp-print-ijs/distinfo b/print/gimp-print-ijs/distinfo
index 27dded08e10..31e0015a9c9 100644
--- a/print/gimp-print-ijs/distinfo
+++ b/print/gimp-print-ijs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/11/27 16:12:36 drochner Exp $
+$NetBSD: distinfo,v 1.5 2003/04/23 17:33:00 drochner Exp $
-SHA1 (gimp-print-4.2.4.tar.gz) = d93e7abff8f968e9aa631ead0987d702f012d9fc
-Size (gimp-print-4.2.4.tar.gz) = 4938844 bytes
+SHA1 (gimp-print-4.2.5.tar.gz) = d1c25aed4412837888cf24be3e8b4aed8a407a49
+Size (gimp-print-4.2.5.tar.gz) = 4992416 bytes
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index 254309aa1b0..56189318841 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/11/27 16:12:36 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2003/04/23 17:33:00 drochner Exp $
#
-DISTNAME= gimp-print-4.2.4
-PKGNAME= gimp-print-lib-4.2.4
+DISTNAME= gimp-print-4.2.5
+PKGNAME= gimp-print-lib-4.2.5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
diff --git a/print/gimp-print-lib/PLIST b/print/gimp-print-lib/PLIST
index dd02757750c..99b9e212375 100644
--- a/print/gimp-print-lib/PLIST
+++ b/print/gimp-print-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/11/27 16:12:36 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/04/23 17:33:00 drochner Exp $
bin/gimpprint-config
include/gimp-print/gimp-print.h
@unexec install-info --delete --info-dir=%D/info %D/info/gimpprint.info
@@ -12,8 +12,8 @@ info/gimpprint.info-5
lib/libgimpprint.a
lib/libgimpprint.la
lib/libgimpprint.so
-lib/libgimpprint.so.1
-lib/libgimpprint.so.1.4
+lib/libgimpprint.so.2
+lib/libgimpprint.so.2.0
man/man1/gimpprint-config.1
man/man3/gimpprint.3
man/man7/gimpprint-color.7
diff --git a/print/gimp-print-lib/buildlink2.mk b/print/gimp-print-lib/buildlink2.mk
index 7ae4ecf7a6f..e4e4c169fdd 100644
--- a/print/gimp-print-lib/buildlink2.mk
+++ b/print/gimp-print-lib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/10 18:37:45 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/04/23 17:33:00 drochner Exp $
.if !defined(GIMP_PRINT_BUILDLINK2_MK)
GIMP_PRINT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gimp-print-lib
-BUILDLINK_DEPENDS.gimp-print-lib?= gimp-print-lib-4.2.4
+BUILDLINK_DEPENDS.gimp-print-lib?= gimp-print-lib-4.2.5
BUILDLINK_PKGSRCDIR.gimp-print-lib?= ../../print/gimp-print-lib
EVAL_PREFIX+= BUILDLINK_PREFIX.gimp-print-lib=gimp-print-lib
diff --git a/print/gimp-print-lib/distinfo b/print/gimp-print-lib/distinfo
index 5fbba99322a..535d7d492b2 100644
--- a/print/gimp-print-lib/distinfo
+++ b/print/gimp-print-lib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2002/11/27 16:12:37 drochner Exp $
+$NetBSD: distinfo,v 1.8 2003/04/23 17:33:00 drochner Exp $
-SHA1 (gimp-print-4.2.4.tar.gz) = d93e7abff8f968e9aa631ead0987d702f012d9fc
-Size (gimp-print-4.2.4.tar.gz) = 4938844 bytes
+SHA1 (gimp-print-4.2.5.tar.gz) = d1c25aed4412837888cf24be3e8b4aed8a407a49
+Size (gimp-print-4.2.5.tar.gz) = 4992416 bytes
SHA1 (patch-aa) = ea28519ac4f5dd02bc9d4d0bb65e271aa7d83dc6
-SHA1 (patch-ab) = ac96c5825c09a8507ce16efd95fa9d24720d6899
+SHA1 (patch-ab) = eaf6c42f230da8affd0e60920666869bba620896
SHA1 (patch-ac) = 2e7c114dd67e21b861bac405cc1a665460e66867
diff --git a/print/gimp-print-lib/patches/patch-ab b/print/gimp-print-lib/patches/patch-ab
index b5c3503d4c0..dbd65a11d50 100644
--- a/print/gimp-print-lib/patches/patch-ab
+++ b/print/gimp-print-lib/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/02/15 20:46:28 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/23 17:33:01 drochner Exp $
---- src/main/gimpprint-config.in.orig Fri Feb 15 20:03:27 2002
-+++ src/main/gimpprint-config.in Fri Feb 15 20:04:48 2002
+--- src/main/gimpprint-config.in.orig 2003-01-24 03:10:29.000000000 +0100
++++ src/main/gimpprint-config.in 2003-04-03 22:06:48.000000000 +0200
@@ -87,7 +87,7 @@
fi
if test "$echo_libs" = "yes"; then
- libdirs=-L@libdir@
+ libdirs="-L@libdir@ -Wl,-R@libdir@"
- echo $libdirs $gimpprint_libs @INTLLIBS@
+ echo $libdirs $gimpprint_libs
fi
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 515afef3f77..0f1deef772b 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/11/27 16:12:35 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/23 17:32:59 drochner Exp $
#
-DISTNAME= gimp-print-4.2.4
+DISTNAME= gimp-print-4.2.5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
diff --git a/print/gimp-print/distinfo b/print/gimp-print/distinfo
index 5b26d01822c..c194d1c36bc 100644
--- a/print/gimp-print/distinfo
+++ b/print/gimp-print/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/11/27 16:12:35 drochner Exp $
+$NetBSD: distinfo,v 1.7 2003/04/23 17:32:59 drochner Exp $
-SHA1 (gimp-print-4.2.4.tar.gz) = d93e7abff8f968e9aa631ead0987d702f012d9fc
-Size (gimp-print-4.2.4.tar.gz) = 4938844 bytes
+SHA1 (gimp-print-4.2.5.tar.gz) = d1c25aed4412837888cf24be3e8b4aed8a407a49
+Size (gimp-print-4.2.5.tar.gz) = 4992416 bytes
SHA1 (patch-aa) = bfaa771e1c21319f1834edba9605dafea62a21a9
SHA1 (patch-ab) = 2e7c114dd67e21b861bac405cc1a665460e66867
+SHA1 (patch-ac) = 76e6a85103ce89b1fceb63abdcecf309b352f914
diff --git a/print/gimp-print/patches/patch-ac b/print/gimp-print/patches/patch-ac
new file mode 100644
index 00000000000..f0ce3b0125c
--- /dev/null
+++ b/print/gimp-print/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/04/23 17:32:59 drochner Exp $
+
+--- src/gimp/Makefile.in.orig 2003-04-03 23:12:43.000000000 +0200
++++ src/gimp/Makefile.in 2003-04-03 23:15:28.000000000 +0200
+@@ -211,7 +211,7 @@
+ print_SOURCES = print-image-gimp.c print-intl.h print.c gimp_color_window.c gimp_main_window.c print_gimp.h
+
+ print_LDADD = $(LIBPRINTUT) $(GIMP_LIBS) $(LIBGIMPPRINT_LIBS)
+-print_DEPENDENCIES = $(LIBGIMPPRINT_LIBS)
++print_DEPENDENCIES =
+
+ CLEANFILES = $(EXTRA_PROGRAMS)
+ MAINTAINERCLEANFILES = Makefile.in