diff options
| author | jlam <jlam@pkgsrc.org> | 2000-03-24 18:26:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-03-24 18:26:43 +0000 |
| commit | 4e25c5d48d2941e0f1789a253f3da29de992bf14 (patch) | |
| tree | a46fb99c68bb01d17906096fb7036c21a5d5389d /print/ggv | |
| parent | 5f8ccfa12be82a6762efd28063f688ca421dd9b0 (diff) | |
| download | pkgsrc-4e25c5d48d2941e0f1789a253f3da29de992bf14.tar.gz | |
Adapt to use ghostscript-x11.
Diffstat (limited to 'print/ggv')
| -rw-r--r-- | print/ggv/Makefile | 8 | ||||
| -rw-r--r-- | print/ggv/files/patch-sum | 6 | ||||
| -rw-r--r-- | print/ggv/patches/patch-aa | 28 |
3 files changed, 30 insertions, 12 deletions
diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 85eca1f3c14..2f847908c80 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/03/24 08:29:06 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2000/03/24 18:26:43 jlam Exp $ # DISTNAME= ggv-0.50 @@ -8,11 +8,15 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ggv/} MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ -DEPENDS+= ghostscript-5.50:../../print/ghostscript5 +BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +DEPENDS+= ghostscript-x11-5.50:../../print/ghostscript5-x11 DEPENDS+= gnome-core-*:../../x11/gnome-core GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_X11BASE= YES +pre-configure: + cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf + .include "../../mk/bsd.pkg.mk" diff --git a/print/ggv/files/patch-sum b/print/ggv/files/patch-sum index 79b184a0be5..48c6611079a 100644 --- a/print/ggv/files/patch-sum +++ b/print/ggv/files/patch-sum @@ -1,3 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/08/22 20:29:08 rh Exp $ +$NetBSD: patch-sum,v 1.2 2000/03/24 18:26:45 jlam Exp $ -MD5 (patch-aa) = 1f1e9e34045ff74d756bdc41d1628ade +MD5 (patch-aa) = 29170ed4ec9d1e553b65704503b67197 +MD5 (patch-ab) = 528282c2dbb02d1ec67ba649ab185f87 +MD5 (patch-ac) = 8b39e83733862cf46aaf0e7dd23630ad diff --git a/print/ggv/patches/patch-aa b/print/ggv/patches/patch-aa index c83a6a4be73..52b04aefbb8 100644 --- a/print/ggv/patches/patch-aa +++ b/print/ggv/patches/patch-aa @@ -1,14 +1,26 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/08/22 20:27:24 rh Exp $ +$NetBSD: patch-aa,v 1.2 2000/03/24 18:26:45 jlam Exp $ ---- configure.orig Sat Aug 21 02:38:42 1999 -+++ configure Sun Aug 22 20:19:34 1999 -@@ -2634,7 +2634,9 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" +--- aclocal.m4.orig Fri Aug 20 17:38:40 1999 ++++ aclocal.m4 Fri Mar 24 09:07:24 2000 +@@ -759,7 +759,11 @@ - # Always use our own libtool. + # serial 35 AC_PROG_LIBTOOL + AC_DEFUN(AC_PROG_LIBTOOL, +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++[ ++# Always use NetBSD's libtool. +if false; then - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi ++ ++AC_REQUIRE([AC_LIBTOOL_SETUP])dnl + # Save cache, so that ltconfig can load it + AC_CACHE_SAVE +@@ -785,6 +789,8 @@ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. + exec 5>>./config.log ++ ++fi + ]) + + AC_DEFUN(AC_LIBTOOL_SETUP, |