diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/graphviz/Makefile | 4 | ||||
| -rw-r--r-- | graphics/graphviz/distinfo | 6 | ||||
| -rw-r--r-- | graphics/graphviz/patches/patch-ab | 20 | ||||
| -rw-r--r-- | graphics/graphviz/patches/patch-ac | 20 |
4 files changed, 38 insertions, 12 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 8b35eff507c..4e5c31e23aa 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/03/10 23:58:40 seb Exp $ # DISTNAME= graphviz-1.8.1 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/dist/ EXTRACT_SUFX= .tgz @@ -19,6 +20,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ENV+= TCLCONFIG=${BUILDLINK_DIR}/lib/tclConfig.sh CONFIGURE_ENV+= TKCONFIG=${BUILDLINK_DIR}/lib/tkConfig.sh +CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} CONFIGURE_ARGS+= --with-extraincludedir=${BUILDLINK_DIR}/include CONFIGURE_ARGS+= --with-extralibdir=${BUILDLINK_DIR}/lib diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index c665f033128..8199f1e4e16 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/03/10 23:58:41 seb Exp $ SHA1 (graphviz-1.8.1.tgz) = a9ec14be381b7dca36b83c321f5115884ce58cec Size (graphviz-1.8.1.tgz) = 2648185 bytes SHA1 (patch-aa) = 1284ea4e38bdf2022bc9e270668f57b4f2953f03 -SHA1 (patch-ab) = efee15e28ddbb1ad93e5b18e39e8ffc0b5089ee0 -SHA1 (patch-ac) = 50be7b29211bf56c76f3f7b9c6d9e54053c89dac +SHA1 (patch-ab) = 00dff60ee8292690b3b3e88159eaa675295733a6 +SHA1 (patch-ac) = 17c6502dd76bb3920f430539b2fb3d397710472b SHA1 (patch-ad) = 10926226514d44eb653d4a2006a14dc60e72f143 SHA1 (patch-ae) = 50b26b99624d5d0dbe6d77af00115d753bccb6c4 SHA1 (patch-af) = 96c1f98a5b1fce31c596435c879af326604da077 diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab index 00f71b7d1ff..3fe9a348fa3 100644 --- a/graphics/graphviz/patches/patch-ab +++ b/graphics/graphviz/patches/patch-ab @@ -1,8 +1,20 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-ab,v 1.2 2002/03/10 23:58:41 seb Exp $ --- configure.in.orig Fri Mar 1 03:47:55 2002 +++ configure.in -@@ -144,12 +144,11 @@ +@@ -45,7 +45,10 @@ + PATHSEPARATOR=";" + else + # This sucks! Whatever happened to standards for file system layout? +-DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/openwin/lib/X11/fonts/TrueType" ++DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype" ++if test x"$X11PREFIX" != x"$X11BASE" ; then ++DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype" ++fi + PATHSEPARATOR=":" + fi + fi +@@ -144,12 +147,11 @@ # Some systems don't have Tcl. Don't build # the Tcl products if we don't have the library. @@ -16,7 +28,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" else AC_MSG_WARN([Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built]) -@@ -220,12 +219,11 @@ +@@ -220,12 +222,11 @@ # Some systems have Tcl, but not TK. Don't build # the Tk products if we don't have the library. @@ -30,7 +42,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ TK_PKGINDEX="tkspline/pkgIndex.tcl" else AC_MSG_WARN([Unable to find tkConfig.sh. The package "tkspline" will not be built]) -@@ -529,36 +527,12 @@ +@@ -529,36 +530,12 @@ # ----------------------------------- # tclInt.h diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac index 3c90af0557d..09996964ed4 100644 --- a/graphics/graphviz/patches/patch-ac +++ b/graphics/graphviz/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-ac,v 1.2 2002/03/10 23:58:41 seb Exp $ --- configure.orig Fri Mar 1 22:34:05 2002 +++ configure @@ -73,7 +73,19 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -6079,12 +6028,11 @@ +@@ -5893,7 +5842,10 @@ + PATHSEPARATOR=";" + else + # This sucks! Whatever happened to standards for file system layout? +-DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/openwin/lib/X11/fonts/TrueType" ++DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype" ++if test x"$X11PREFIX" != x"$X11BASE" ; then ++DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype" ++fi + PATHSEPARATOR=":" + fi + fi +@@ -6079,12 +6031,11 @@ # Some systems don't have Tcl. Don't build # the Tcl products if we don't have the library. @@ -87,7 +99,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" else echo "configure: warning: Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2 -@@ -6156,12 +6104,11 @@ +@@ -6156,12 +6107,11 @@ # Some systems have Tcl, but not TK. Don't build # the Tk products if we don't have the library. @@ -101,7 +113,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ TK_PKGINDEX="tkspline/pkgIndex.tcl" else echo "configure: warning: Unable to find tkConfig.sh. The package "tkspline" will not be built" 1>&2 -@@ -8710,36 +8657,12 @@ +@@ -8710,36 +8660,12 @@ # ----------------------------------- # tclInt.h |