svn commit: r312552 - in head/graphics/jgraph: . files

[Pietro Cerutti]

Author: gahr
Date: Tue Feb 19 09:49:30 2013
New Revision: 312552
URL: http://svnweb.freebsd.org/changeset/ports/312552

Log:
  - Fix build with CLANG
  - Make DATADIR-safe
  - Pet portlint a bit

Modified:
  head/graphics/jgraph/Makefile   (contents, props changed)
  head/graphics/jgraph/files/patch-aa   (contents, props changed)
  head/graphics/jgraph/pkg-plist   (contents, props changed)

Modified: head/graphics/jgraph/Makefile
==============================================================================
--- head/graphics/jgraph/Makefile	Tue Feb 19 09:46:27 2013	(r312551)
+++ head/graphics/jgraph/Makefile	Tue Feb 19 09:49:30 2013	(r312552)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: jgraph
-# Date created:		6 August 1999
-# Whom:			wolman at cs.washington.edu
-#
+# Created by: wolman at cs.washington.edu
 # $FreeBSD$
-#
 
 PORTNAME=	jgraph
 PORTVERSION=	8.3
@@ -17,10 +13,14 @@ COMMENT=	A program that generates postsc
 NO_LATEST_LINK=	yes
 EXTRACT_CMD=	uncompress
 EXTRACT_BEFORE_ARGS=	-c
-EXTRACT_AFTER_ARGS=	| sh
+EXTRACT_AFTER_ARGS=	| ${SH}
 
 NO_WRKSUBDIR=	yes
 MAN1=		jgraph.1
 MAKEFILE=	makefile
 
+MAKE_ENV+=	DATADIR=${DATADIR}
+
+CFLAGS+=	-Wno-return-type
+
 .include <bsd.port.mk>

Modified: head/graphics/jgraph/files/patch-aa
==============================================================================
--- head/graphics/jgraph/files/patch-aa	Tue Feb 19 09:46:27 2013	(r312551)
+++ head/graphics/jgraph/files/patch-aa	Tue Feb 19 09:49:30 2013	(r312552)
@@ -1,5 +1,5 @@
---- makefile.orig	Fri Aug  6 15:11:40 1999
-+++ makefile	Fri Aug  6 15:17:05 1999
+--- makefile.orig	2013-02-19 10:47:01.000000000 +0100
++++ makefile	2013-02-19 10:47:23.000000000 +0100
 @@ -18,6 +18,34 @@
  		show.o \
  		token.o
@@ -35,7 +35,7 @@
  EXAMPLES = \
  	acc.jps		\
  	acc.eps		\
-@@ -58,14 +86,20 @@
+@@ -58,15 +86,21 @@
  .tex.dvi:
  	latex $*.tex
  .c.o: 
@@ -49,12 +49,13 @@
  
  sin:	sin.o
  	cc -o sin sin.o -lm
-+
+ 
 +install: jgraph
 +	install -c -m 555 -o bin -g bin jgraph ${PREFIX}/bin
 +	install -c -m 444 -o bin -g bin jgraph.1 ${PREFIX}/man/man1
-+	-mkdir -p -m 755 ${PREFIX}/share/jgraph
-+	install -c -m 444 -o bin -g bin $(EXAMPLE_SRC) ${PREFIX}/share/jgraph
- 
++	-mkdir -p -m 755 ${DATADIR}
++	install -c -m 444 -o bin -g bin $(EXAMPLE_SRC) ${DATADIR}
++
  ad.jps: cube.eps disk.eps
  bailey.jps: bailey.pts
+ ex2.jps: data.txt

Modified: head/graphics/jgraph/pkg-plist
==============================================================================
--- head/graphics/jgraph/pkg-plist	Tue Feb 19 09:46:27 2013	(r312551)
+++ head/graphics/jgraph/pkg-plist	Tue Feb 19 09:49:30 2013	(r312552)
@@ -1,27 +1,27 @@
 bin/jgraph
-share/jgraph/acc.jgr
-share/jgraph/ad.jgr
-share/jgraph/alb.jgr
-share/jgraph/bailey.jgr
-share/jgraph/cube.jgr
-share/jgraph/data.txt
-share/jgraph/disk.jgr
-share/jgraph/ebars.jgr
-share/jgraph/ex1.jgr
-share/jgraph/ex2.jgr
-share/jgraph/g8.jgr
-share/jgraph/g8col.jgr
-share/jgraph/g9n10.jgr
-share/jgraph/gpaper.jgr
-share/jgraph/hypercube.jgr
-share/jgraph/mab2.jgr
-share/jgraph/mab2.times
-share/jgraph/nr.jgr
-share/jgraph/sin.pts
-share/jgraph/sin1.jgr
-share/jgraph/sin2.jgr
-share/jgraph/sin2.pts
-share/jgraph/sin3.jgr
-share/jgraph/sin3.pts
-share/jgraph/wortman.jgr
- at dirrm share/jgraph
+%%DATADIR%%/acc.jgr
+%%DATADIR%%/ad.jgr
+%%DATADIR%%/alb.jgr
+%%DATADIR%%/bailey.jgr
+%%DATADIR%%/cube.jgr
+%%DATADIR%%/data.txt
+%%DATADIR%%/disk.jgr
+%%DATADIR%%/ebars.jgr
+%%DATADIR%%/ex1.jgr
+%%DATADIR%%/ex2.jgr
+%%DATADIR%%/g8.jgr
+%%DATADIR%%/g8col.jgr
+%%DATADIR%%/g9n10.jgr
+%%DATADIR%%/gpaper.jgr
+%%DATADIR%%/hypercube.jgr
+%%DATADIR%%/mab2.jgr
+%%DATADIR%%/mab2.times
+%%DATADIR%%/nr.jgr
+%%DATADIR%%/sin.pts
+%%DATADIR%%/sin1.jgr
+%%DATADIR%%/sin2.jgr
+%%DATADIR%%/sin2.pts
+%%DATADIR%%/sin3.jgr
+%%DATADIR%%/sin3.pts
+%%DATADIR%%/wortman.jgr
+ at dirrm %%DATADIR%%