diff --git a/graphics/jgraph/Makefile b/graphics/jgraph/Makefile index fc54551ea86a..5280a0575934 100644 --- a/graphics/jgraph/Makefile +++ b/graphics/jgraph/Makefile @@ -1,21 +1,21 @@ PORTNAME= jgraph PORTVERSION= 8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://web.eecs.utk.edu/~plank/plank/jgraph/ DISTFILES= ${PORTNAME}.shar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Generates postscript graphs WWW= https://web.eecs.utk.edu/~plank/plank/jgraph/ EXTRACT_CMD= uncompress EXTRACT_BEFORE_ARGS= -c EXTRACT_AFTER_ARGS= | ${SH} NO_WRKSUBDIR= yes MAKEFILE= makefile MAKE_ENV+= DATADIR=${DATADIR} CFLAGS+= -Wno-return-type .include diff --git a/graphics/jgraph/files/patch-makefile b/graphics/jgraph/files/patch-makefile index 3e74ce280ade..2cd3de3fa18b 100644 --- a/graphics/jgraph/files/patch-makefile +++ b/graphics/jgraph/files/patch-makefile @@ -1,61 +1,61 @@ --- makefile.orig 2015-05-15 15:48:34 UTC +++ makefile @@ -18,6 +18,34 @@ OBJS = draw.o \ show.o \ token.o + +EXAMPLE_SRC = \ + acc.jgr \ + ad.jgr \ + alb.jgr \ + bailey.jgr \ + cube.jgr \ + disk.jgr \ + ebars.jgr \ + ex1.jgr \ + ex2.jgr \ + data.txt \ + g8.jgr \ + g8col.jgr \ + g9n10.jgr \ + gpaper.jgr \ + hypercube.jgr \ + mab2.jgr \ + mab2.times \ + nr.jgr \ + sin.pts \ + sin1.jgr \ + sin2.pts \ + sin2.jgr \ + sin3.pts \ + sin3.jgr \ + wortman.jgr + EXAMPLES = \ acc.jps \ acc.eps \ @@ -58,15 +86,21 @@ examples: $(EXAMPLES) .tex.dvi: latex $*.tex .c.o: - $(CC) -c -g $*.c + $(CC) -c $(CFLAGS) $*.c jgraph: $(OBJS) - $(CC) -g $(OBJS) -lm -o jgraph + $(CC) $(CFLAGS) $(OBJS) -lm -o jgraph sin: sin.o cc -o sin sin.o -lm +install: jgraph + ${BSD_INSTALL_PROGRAM} jgraph ${DESTDIR}${PREFIX}/bin -+ ${BSD_INSTALL_MAN} jgraph.1 ${DESTDIR}${PREFIX}/man/man1 ++ ${BSD_INSTALL_MAN} jgraph.1 ${DESTDIR}${PREFIX}/share/man/man1 + -mkdir -p -m 755 ${DESTDIR}${DATADIR} + ${BSD_INSTALL_DATA} $(EXAMPLE_SRC) ${DESTDIR}${DATADIR} + ad.jps: cube.eps disk.eps bailey.jps: bailey.pts ex2.jps: data.txt diff --git a/graphics/jgraph/pkg-plist b/graphics/jgraph/pkg-plist index f2c9d4bce81d..9caffa297c6f 100644 --- a/graphics/jgraph/pkg-plist +++ b/graphics/jgraph/pkg-plist @@ -1,27 +1,27 @@ bin/jgraph -man/man1/jgraph.1.gz +share/man/man1/jgraph.1.gz %%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