From nobody@FreeBSD.ORG  Mon Aug 21 09:24:28 2000
Return-Path: <nobody@FreeBSD.ORG>
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC6E037B42C; Mon, 21 Aug 2000 09:24:28 -0700 (PDT)
Message-Id: <20000821162428.AC6E037B42C@hub.freebsd.org>
Date: Mon, 21 Aug 2000 09:24:28 -0700 (PDT)
From: tkato@prontomail.ne.jp
Sender: nobody@FreeBSD.ORG
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: graphics/graphviz
X-Send-Pr-Version: www-1.0

>Number:         20754
>Category:       ports
>Synopsis:       Update port: graphics/graphviz
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 21 09:30:02 PDT 2000
>Closed-Date:    Mon Sep 4 18:54:50 PDT 2000
>Last-Modified:  Mon Sep 04 18:55:32 PDT 2000
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support MAKE properly
- Change location of data files from libdata/ to share/

New file:
patches/patch-ao  patches/patch-ap  patches/patch-aq 
files/freebsd.generic

Remove file:
patches/patch-ak

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/graphviz/Makefile graphics/graphviz/Makefile
--- /usr/ports/graphics/graphviz/Makefile	Sat Apr 15 00:25:01 2000
+++ graphics/graphviz/Makefile	Tue Aug 15 08:59:05 2000
@@ -24,6 +24,9 @@
 
 DOCDIR=		${PREFIX}/share/doc/graphviz
 
+post-extract:
+	@${CP} ${FILESDIR}/freebsd.generic ${WRKSRC}/makearch
+
 post-install:
 	@${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.htm* ${DOCDIR}
diff -urN /usr/ports/graphics/graphviz/files/freebsd.generic graphics/graphviz/files/freebsd.generic
--- /usr/ports/graphics/graphviz/files/freebsd.generic	Thu Jan  1 09:00:00 1970
+++ graphics/graphviz/files/freebsd.generic	Tue Aug 15 08:51:22 2000
@@ -0,0 +1,29 @@
+X11LIB=${X11BASE}/lib
+X11INC=${X11BASE}/include
+
+#CC=cc
+#YACC=bison -y
+FLEX=flex -8
+SED=sed
+LN=ln
+RM=rm -f
+RANLIB=ranlib
+MKDIR=mkdir
+AR=ar
+LD=ld -r
+MV=mv
+CP=cp
+AWK=awk
+SORT=sort
+INSTALL_PROGRAM=$(BSD_INSTALL_PROGRAM)
+INSTALL_SCRIPT=$(BSD_INSTALL_SCRIPT)
+INSTALL_DATA=$(BSD_INSTALL_DATA)
+INSTALL_MAN=$(BSD_INSTALL_MAN)
+MKPATH=mkdir -p
+
+CFLAGS+=-DHAVE_SYS_ERRLIST -DHAVE_TERMIOS
+CCFLAGS=${CFLAGS}
+LDFLAGS=
+SHLIB_LD=${CC} -shared
+SHLIB_SUFFIX=.so
+# LEFTYLIBS=-lSM -lICE
diff -urN /usr/ports/graphics/graphviz/patches/patch-ak graphics/graphviz/patches/patch-ak
--- /usr/ports/graphics/graphviz/patches/patch-ak	Sun Jan 30 06:51:03 2000
+++ graphics/graphviz/patches/patch-ak	Thu Jan  1 09:00:00 1970
@@ -1,32 +0,0 @@
---- makearch/freebsd.i386.orig	Sat Jan 29 14:49:06 2000
-+++ makearch/freebsd.i386	Sat Jan 29 14:52:49 2000
-@@ -0,0 +1,29 @@
-+X11LIB=${X11BASE}/lib
-+X11INC=${X11BASE}/include
-+
-+#CC=cc
-+#YACC=bison -y
-+FLEX=flex -8
-+SED=sed
-+LN=ln
-+RM=rm -f
-+RANLIB=ranlib
-+MKDIR=mkdir
-+AR=ar
-+LD=ld -r
-+MV=mv
-+CP=cp
-+AWK=awk
-+SORT=sort
-+INSTALL_PROGRAM=$(BSD_INSTALL_PROGRAM)
-+INSTALL_SCRIPT=$(BSD_INSTALL_SCRIPT)
-+INSTALL_DATA=$(BSD_INSTALL_DATA)
-+INSTALL_MAN=$(BSD_INSTALL_MAN)
-+MKPATH=mkdir -p
-+
-+CFLAGS+=-DHAVE_SYS_ERRLIST -DHAVE_TERMIOS
-+CCFLAGS=${CFLAGS}
-+LDFLAGS=
-+SHLIB_LD=${CC} -shared
-+SHLIB_SUFFIX=.so
-+# LEFTYLIBS=-lSM -lICE
diff -urN /usr/ports/graphics/graphviz/patches/patch-al graphics/graphviz/patches/patch-al
--- /usr/ports/graphics/graphviz/patches/patch-al	Fri Feb 18 13:05:34 2000
+++ graphics/graphviz/patches/patch-al	Tue Aug 15 08:57:02 2000
@@ -4,7 +4,7 @@
  #ARCH=hp.pa
  #ARCH=sgi.mips2
  #ARCH=sol.i386
-+ARCH=freebsd.i386
++ARCH=freebsd.generic
  
  # specify installation targets
  # The actual builds occur 3 levels down from the root directory,
@@ -41,7 +41,7 @@
  
  BINDIR=$(INSTALLROOT)/bin
 -LIBDIR=$(INSTALLROOT)/lib
-+LIBDIR=$(INSTALLROOT)/libdata
++LIBDIR=$(INSTALLROOT)/share/graphviz
  INCDIR=$(INSTALLROOT)/include
  MANDIR=$(INSTALLROOT)/man/man1
  LIBMANDIR=$(INSTALLROOT)/man/man3
diff -urN /usr/ports/graphics/graphviz/patches/patch-an graphics/graphviz/patches/patch-an
--- /usr/ports/graphics/graphviz/patches/patch-an	Mon Jun 28 22:23:32 1999
+++ graphics/graphviz/patches/patch-an	Tue Aug 15 08:52:31 2000
@@ -1,11 +1,12 @@
---- src/lib/makefile.orig	Wed Dec  9 20:00:00 1998
-+++ src/lib/makefile	Mon Jun 28 14:54:42 1999
+--- src/lib/makefile.orig	Fri May 28 04:56:11 1999
++++ src/lib/makefile	Tue Aug 15 08:52:17 2000
 @@ -1,4 +1,7 @@
  SUBDIRS = cdt graph agraph gdft pathplan
  
 -all clean distclean install:
+-	(for i in ${SUBDIRS}; do (cd $$i; make $@); done)       
 +all clean distclean:
- 	(for i in ${SUBDIRS}; do (cd $$i; make $@); done)       
++	(for i in ${SUBDIRS}; do (cd $$i; ${MAKE} $@); done)       
 +
 +install:
 +	@true
diff -urN /usr/ports/graphics/graphviz/patches/patch-ao graphics/graphviz/patches/patch-ao
--- /usr/ports/graphics/graphviz/patches/patch-ao	Thu Jan  1 09:00:00 1970
+++ graphics/graphviz/patches/patch-ao	Tue Aug 15 19:14:08 2000
@@ -0,0 +1,8 @@
+--- makefile.orig	Fri May 28 05:00:24 1999
++++ makefile	Tue Aug 15 19:13:57 2000
+@@ -4,4 +4,4 @@
+ SUBDIRS = $(LIBDIR) $(CMDDIR) $(PKGDIR)
+ 
+ all clean distclean install:
+-	(for i in ${SUBDIRS}; do (cd $$i; make $@); done)       
++	(for i in ${SUBDIRS}; do (cd $$i; ${MAKE} $@); done)       
diff -urN /usr/ports/graphics/graphviz/patches/patch-ap graphics/graphviz/patches/patch-ap
--- /usr/ports/graphics/graphviz/patches/patch-ap	Thu Jan  1 09:00:00 1970
+++ graphics/graphviz/patches/patch-ap	Tue Aug 15 19:16:23 2000
@@ -0,0 +1,8 @@
+--- src/cmd/makefile.orig	Fri May 28 04:55:34 1999
++++ src/cmd/makefile	Tue Aug 15 19:16:12 2000
+@@ -1,4 +1,4 @@
+ SUBDIRS = dot neato lefty
+ 
+ all clean distclean install:
+-	(for i in ${SUBDIRS}; do (cd $$i; make $@); done)       
++	(for i in ${SUBDIRS}; do (cd $$i; ${MAKE} $@); done)       
diff -urN /usr/ports/graphics/graphviz/patches/patch-aq graphics/graphviz/patches/patch-aq
--- /usr/ports/graphics/graphviz/patches/patch-aq	Thu Jan  1 09:00:00 1970
+++ graphics/graphviz/patches/patch-aq	Tue Aug 15 19:17:01 2000
@@ -0,0 +1,8 @@
+--- src/pkg/makefile.orig	Fri May 28 04:56:25 1999
++++ src/pkg/makefile	Tue Aug 15 19:16:53 2000
+@@ -1,4 +1,4 @@
+ SUBDIRS = dotty lneato tcldot
+ 
+ all clean distclean install:
+-	(for i in ${SUBDIRS}; do (cd $$i; make $@); done)       
++	(for i in ${SUBDIRS}; do (cd $$i; ${MAKE} $@); done)       
diff -urN /usr/ports/graphics/graphviz/pkg/PLIST graphics/graphviz/pkg/PLIST
--- /usr/ports/graphics/graphviz/pkg/PLIST	Fri Feb 18 13:05:35 2000
+++ graphics/graphviz/pkg/PLIST	Tue Aug 15 08:56:36 2000
@@ -4,14 +4,12 @@
 bin/lneato
 bin/neato
 lib/Tcldot/Tcldot.so.1.5
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/Tcldot/pkgIndex.tcl
-libdata/lefty/dotty.lefty
-libdata/lefty/dotty_draw.lefty
-libdata/lefty/dotty_edit.lefty
-libdata/lefty/dotty_layout.lefty
-libdata/lefty/dotty_ui.lefty
+share/graphviz/lefty/dotty.lefty
+share/graphviz/lefty/dotty_draw.lefty
+share/graphviz/lefty/dotty_edit.lefty
+share/graphviz/lefty/dotty_layout.lefty
+share/graphviz/lefty/dotty_ui.lefty
 share/doc/graphviz/FAQ.html
 share/doc/graphviz/FAQ.txt
 share/doc/graphviz/LICENSE.html
@@ -24,5 +22,5 @@
 share/doc/graphviz/neatoguide.ps.gz
 share/doc/graphviz/tcldot.html
 @dirrm share/doc/graphviz
-@dirrm libdata/lefty
+@dirrm share/graphviz/lefty
 @dirrm lib/Tcldot


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Mon Sep 4 18:54:50 PDT 2000 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=20754 
>Unformatted:
