summaryrefslogtreecommitdiff
path: root/cad/geda
diff options
context:
space:
mode:
authorrh <rh@pkgsrc.org>1999-02-19 14:26:57 +0000
committerrh <rh@pkgsrc.org>1999-02-19 14:26:57 +0000
commit0a0cd3f622a0225a3f1bba113dad3b0d88196956 (patch)
tree038f32847c82caeaaf9f8811553a74d345a436d9 /cad/geda
parentcadf4e6be1533a87d296b9eb618ccfee5ad2cf5e (diff)
downloadpkgsrc-0a0cd3f622a0225a3f1bba113dad3b0d88196956.tar.gz
Adapt in order to work together with new gtk10 package
Remove deprecated CONFLICTS with prior versions
Diffstat (limited to 'cad/geda')
-rw-r--r--cad/geda/Makefile7
-rw-r--r--cad/geda/patches/patch-aa28
2 files changed, 29 insertions, 6 deletions
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index b7665393c7e..0d000864fe4 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/04 21:21:23 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/19 14:26:57 rh Exp $
#
DISTNAME= gEDA-19990124
@@ -10,13 +10,12 @@ MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/dist/ \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.geda.seul.org/
-DEPENDS+= gtk+-1.0.6:../../x11/gtk10
+DEPENDS+= gtk10-1.0.6:../../x11/gtk10
DEPENDS+= guile-1.3:../../lang/guile
-CONFLICTS= gEDA-*
-
GNU_CONFIGURE= yes
USE_X11BASE= yes
USE_LIBTOOL= yes
+CONFIGURE_ARGS= --with-gtk-config=${X11BASE}/bin/gtk10-config
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda/patches/patch-aa b/cad/geda/patches/patch-aa
index b107216c2e4..d27b152d321 100644
--- a/cad/geda/patches/patch-aa
+++ b/cad/geda/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/02/04 21:21:23 frueauf Exp $
+$NetBSD: patch-aa,v 1.4 1999/02/19 14:26:57 rh Exp $
--- configure.orig Sun Jan 24 06:00:00 1999
-+++ configure Wed Feb 3 20:40:53 1999
++++ configure Fri Feb 19 13:56:11 1999
@@ -1327,7 +1327,6 @@
fi
@@ -10,3 +10,27 @@ $NetBSD: patch-aa,v 1.3 1999/02/04 21:21:23 frueauf Exp $
# Check for any special flags to pass to ltconfig.
libtool_flags=
+@@ -2853,9 +2852,9 @@
+ if eval "test x$gtkdir != x"; then
+ CFEXTRA="-I$gtkdir -I$gtkdir/glib"
+ LDEXTRA="-L$gtkdir/glib/.libs -L$gtkdir/gdk/.libs -L$gtkdir/gtk/.libs `$GTKCONFIG --libs`"
+- GTK=-lgtk
+- GDK=-lgdk
+- GLIB=-lglib
++ GTK=-lgtk10
++ GDK=-lgdk10
++ GLIB=-lglib10
+ X_LDFLAGS=`$GTKCONFIG --libs`
+ X_CFLAGS=`$GTKCONFIG --cflags`
+ gtkversion=1.0
+@@ -2894,8 +2893,8 @@
+ fi
+
+
+-CFLAGS="$CFLAGS $CFEXTRA `$GTKCONFIG --cflags`"
+-LDFLAGS="$LDEXTRA `$GTKCONFIG --libs` -lgtk -lgdk -lglib $LDFLAGS -lm"
++CFLAGS="`$GTKCONFIG --cflags` $CFLAGS $CFEXTRA"
++LDFLAGS="$LDEXTRA `$GTKCONFIG --libs` $LDFLAGS -lm"
+
+ echo $ac_n "checking for the rest of gtk""... $ac_c" 1>&6
+ echo "configure:2902: checking for the rest of gtk" >&5