From shaun@inerd.com  Fri May 12 14:31:29 2006
Return-Path: <shaun@inerd.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E4B9816A434
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 May 2006 14:31:29 +0000 (UTC)
	(envelope-from shaun@inerd.com)
Received: from dione.picobyte.net (host-212-158-207-124.bulldogdsl.com [212.158.207.124])
	by mx1.FreeBSD.org (Postfix) with SMTP id DEA6243D53
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 May 2006 14:31:28 +0000 (GMT)
	(envelope-from shaun@inerd.com)
Received: from charon.picobyte.net (charon.picobyte.net [IPv6:2001:4bd0:201e::fe03])
	by dione.picobyte.net (Postfix) with ESMTP
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 May 2006 15:31:26 +0100 (BST)
Message-Id: <1147444286.99381@charon.picobyte.net>
Date: Fri, 12 May 2006 15:31:26 +0100
From: Shaun Amott <shaun@inerd.com>
Reply-To: Shaun Amott <shaun@inerd.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] graphics/graphviz: fix PLIST
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         97176
>Category:       ports
>Synopsis:       [MAINTAINER] graphics/graphviz: fix PLIST
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 12 14:40:09 GMT 2006
>Closed-Date:    Sun May 14 12:31:19 GMT 2006
>Last-Modified:  Sun May 14 12:31:19 GMT 2006
>Originator:     Shaun Amott
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:

>Description:

- Add empty directories to pkg-plist

Tinderbox doesn't fail on this kind of thing. :(

>How-To-Repeat:

>Fix:

--- graphviz.diff begins here ---
Index: graphviz/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/graphviz/pkg-plist,v
retrieving revision 1.30
diff -u -r1.30 pkg-plist
--- graphviz/pkg-plist	5 May 2006 09:46:58 -0000	1.30
+++ graphviz/pkg-plist	12 May 2006 14:28:45 -0000
@@ -380,6 +380,11 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/pathplan_data
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@exec mkdir -p %D/lib/graphviz/guile
+@exec mkdir -p %D/lib/graphviz/java
+@exec mkdir -p %D/lib/graphviz/ocaml
+@exec mkdir -p %D/lib/graphviz/php
+@exec mkdir -p %D/lib/graphviz/sharp
 @dirrm %%DATADIR%%/graphs/directed
 @dirrm %%DATADIR%%/graphs/undirected
 @dirrm %%DATADIR%%/graphs
--- graphviz.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Fri May 12 14:54:53 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97176 

From: Adi Pircalabu <apircalabu@bitdefender.com>
To: bug-followup@FreeBSD.org, shaun@inerd.com
Cc: itetcu@freebsd.org
Subject: Re: ports/97176: [MAINTAINER] graphics/graphviz: fix PLIST
Date: Fri, 12 May 2006 18:04:46 +0300

 Hi,
 being at it, can you please update pkg-descr? The actual URL returns
 404.
 Thanks
 
 Diff follows
 
 --- pkg-descr.diff starts here ---
 
 --- /usr/ports/graphics/graphviz/pkg-descr      Fri May  5 14:31:13 2006
 +++ /data/adi/work/ports/graphviz/pkg-descr     Fri May 12 17:59:06 2006
 @@ -11,4 +11,4 @@
      neato  - batch program for drawing undirected graphs using
 Kamada-Kawai spring models
 
 -WWW: http://www.research.att.com/sw/tools/graphviz/
 +WWW: http://www.graphviz.org/
 
 --- pkg-descr.diff ends here ---
 
 -- 
 Adi Pircalabu (PGP Key ID 0x04329F5E)
 
 
 -- 
 This message was scanned for spam and viruses by BitDefender.
 For more information please visit http://www.bitdefender.com/
 

From: Shaun Amott <shaun@inerd.com>
To: Adi Pircalabu <apircalabu@bitdefender.com>
Cc: bug-followup@FreeBSD.org, itetcu@freebsd.org
Subject: Re: ports/97176: [MAINTAINER] graphics/graphviz: fix PLIST
Date: Fri, 12 May 2006 16:17:51 +0100

 On Fri, May 12, 2006 at 06:04:46PM +0300, Adi Pircalabu wrote:
 > 
 > Hi,
 > being at it, can you please update pkg-descr? The actual URL returns
 > 404.
 > Thanks
 > 
 > Diff follows
 > 
 > --- pkg-descr.diff starts here ---
 > 
 > --- /usr/ports/graphics/graphviz/pkg-descr      Fri May  5 14:31:13 2006
 > +++ /data/adi/work/ports/graphviz/pkg-descr     Fri May 12 17:59:06 2006
 > @@ -11,4 +11,4 @@
 >      neato  - batch program for drawing undirected graphs using
 > Kamada-Kawai spring models
 > 
 > -WWW: http://www.research.att.com/sw/tools/graphviz/
 > +WWW: http://www.graphviz.org/
 > 
 > --- pkg-descr.diff ends here ---
 > 
 
 Yes, this is fine. I approve. The license link should be updated too:
 
 http://www.graphviz.org/License.php
 
 -- 
 Shaun Amott [ PGP: 0x6B387A9A ]
     Scientia Est Potentia.
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Sat May 13 23:14:35 UTC 2006 
State-Changed-Why:  
It looks like the Makefile could use a few variables from bsd.tcl.mk. 
Could you please check this and, if true, either submit a new diff ? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97176 

From: Shaun Amott <shaun@inerd.com>
To: Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/97176: [MAINTAINER] graphics/graphviz: fix PLIST
Date: Sun, 14 May 2006 02:43:36 +0100

 On Sat, May 13, 2006 at 11:14:35PM +0000, Ion-Mihai Tetcu wrote:
 > 
 > It looks like the Makefile could use a few variables from bsd.tcl.mk.
 > Could you please check this and, if true, either submit a new diff ?
 > 
 
 Patch below.
 
 -----Begin graphviz.diff-----
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/graphics/graphviz/Makefile,v
 retrieving revision 1.68
 diff -u -r1.68 Makefile
 --- Makefile	5 May 2006 09:46:58 -0000	1.68
 +++ Makefile	14 May 2006 01:40:22 -0000
 @@ -22,22 +22,24 @@
  		expat.6:${PORTSDIR}/textproc/expat2		\
  		gd.4:${PORTSDIR}/graphics/gd
  
 +USE_TCL=	84
 +USE_TK=		84
  USE_BISON=	yes
  USE_GMAKE=	yes
  USE_ICONV=	yes
  USE_XPM=	yes
  USE_AUTOTOOLS=	libltdl:15
  GNU_CONFIGURE=	yes
 -CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
 +CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
  		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	\
 -		TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh	\
 -		TKCONFIG=${LOCALBASE}/lib/tk8.4/tkConfig.sh	\
 +		TCLCONFIG=${TCL_LIBDIR}/tclConfig.sh		\
 +		TKCONFIG=${TK_LIBDIR}/tkConfig.sh		\
  		MISSING=${TRUE}
  CONFIGURE_ARGS=	--program-transform-name="s/x/x/"		\
  		--enable-dependency-tracking			\
  		--with-iconvlibdir=${LOCALBASE}/lib		\
 -		--with-tclsh=${LOCALBASE}/tcl8.4		\
 -		--with-wish=${LOCALBASE}/wish8.4		\
 +		--with-tclsh=${TCLSH}				\
 +		--with-wish=${WISH}				\
  		--with-fontconfigincludedir=${X11BASE}/include	\
  		--with-fontconfiglibdir=${X11BASE}/lib		\
  		--disable-swig --disable-sharp --disable-guile	\
 @@ -57,6 +59,10 @@
  		dot.1 neato.1		\
  		dot.1 twopi.1
  
 +PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted \
 +			tclpkg/tclpathplan/demo/pathplan tclpkg/tkspline/demo/spline
 +PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
 +
  PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.txt
  PDOCS_PDF=	doc/*.pdf */*/*.pdf
  PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
 @@ -68,7 +74,7 @@
  .include <bsd.port.pre.mk>
  .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
  
 -post-patch:
 +pre-patch:
  	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}					\
  	  ${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|'	\
  	                   -e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g"		\
 @@ -86,12 +92,6 @@
  .if ${OSVERSION} < 500000
  	@${REINPLACE_CMD} 's|-Wno-unused-parameter||g' ${WRKSRC}/configure
  .endif
 -	@${REINPLACE_CMD} -e 's|tclsh|tclsh8.4|g' ${WRKSRC}/tclpkg/gv/Makefile.in
 -	@${REINPLACE_CMD} -e 's|tclsh|tclsh8.4|g'			\
 -	                  -e 's|wish|wish8.4|g'				\
 -	                  ${WRKSRC}/tclpkg/tcldot/demo/doted		\
 -	                  ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan	\
 -	                  ${WRKSRC}/tclpkg/tkspline/demo/spline
  
  post-install-script:
  	${INSTALL_MAN} ${WRKSRC}/tclpkg/gdtclft/gdtclft.n   ${MANNPREFIX}/man/mann
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/graphics/graphviz/pkg-plist,v
 retrieving revision 1.30
 diff -u -r1.30 pkg-plist
 --- pkg-plist	5 May 2006 09:46:58 -0000	1.30
 +++ pkg-plist	14 May 2006 01:40:22 -0000
 @@ -380,6 +380,11 @@
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/pathplan_data
  %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 +@exec mkdir -p %D/lib/graphviz/guile
 +@exec mkdir -p %D/lib/graphviz/java
 +@exec mkdir -p %D/lib/graphviz/ocaml
 +@exec mkdir -p %D/lib/graphviz/php
 +@exec mkdir -p %D/lib/graphviz/sharp
  @dirrm %%DATADIR%%/graphs/directed
  @dirrm %%DATADIR%%/graphs/undirected
  @dirrm %%DATADIR%%/graphs
 -----End graphviz.diff-----
 
 -- 
 Shaun Amott [ PGP: 0x6B387A9A ]
     Scientia Est Potentia.
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Sun May 14 02:36:37 UTC 2006 
State-Changed-Why:  
New patch received 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97176 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Sun May 14 12:31:17 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

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