2 files changed, 96 insertions, 100 deletions

diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 6061fbc6e168..316dfc864c43 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -14,49 +14,42 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	chuckr@FreeBSD.org
 COMMENT=	A command-driven interactive function plotting program
 
-LIB_DPEENDS=
-.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-.endif
-.if !defined(WITHOUT_PDF)
-LIB_DEPENDS+=	pdf.4:${PORTSDIR}/print/pdflib4
-.endif
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
+		--without-linux-vga --without-gd \
+		--with-readline=gnu --with-lasergnu
+
+MAN1=		gnuplot.1 lasergnu.1
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
+PLIST_SUB+=		X11:=""
+.else
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=		X11:="@comment "
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
-		--includedir=${LOCALBASE}/include/ \
-		--libdir=${LOCALBASE}/lib \
-		--without-linux-vga --without-gd \
-		--with-readline=gnu --with-lasergnu 
 .if !defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=--with-png=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-png
-.endif
-.if !defined(WITHOUT_PDF)
-CONFIGURE_ARGS+=--with-pdf=${LOCALBASE}
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+CONFIGURE_ARGS+=	--with-png=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=--without-pdf
+CONFIGURE_ARGS+=	--without-png
 .endif
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=		X11:="@comment "
+.if !defined(WITHOUT_PDF)
+LIB_DEPENDS+=	pdf.4:${PORTSDIR}/print/pdflib
+CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--with-x
-PLIST_SUB+=		X11:=""
+CONFIGURE_ARGS+=	--without-pdf
 .endif
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/gnuplot
-	(cd ${WRKSRC}/demo;for EXAMPLES in ${WRKSRC}/demo/*; do ${INSTALL_DATA} $${EXAMPLES} ${PREFIX}/share/doc/gnuplot;done)
-	${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/doc/gnuplot
-
-MAN1=		gnuplot.1 lasergnu.1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/demo/* ${EXAMPLESDIR}
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/gnuplot.gih ${DATADIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index 131623bc618d..d95950576205 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -1,71 +1,74 @@
-bin/lasergnu
 bin/gnuplot
 %%X11:%%bin/gnuplot_x11
-info/gnuplot.info
-share/gnuplot.gih
-share/doc/gnuplot/1.dat
-share/doc/gnuplot/2.dat
-share/doc/gnuplot/3.dat
-share/doc/gnuplot/airfoil.dem
-share/doc/gnuplot/all.dem
-share/doc/gnuplot/animate.dem
-share/doc/gnuplot/battery.dat
-share/doc/gnuplot/big_peak.dat
-share/doc/gnuplot/binary.dem
-share/doc/gnuplot/bivariat.dem
-share/doc/gnuplot/borders.dem
-share/doc/gnuplot/contours.dem
-share/doc/gnuplot/controls.dem
-share/doc/gnuplot/density.fnc
-share/doc/gnuplot/discrete.dem
-share/doc/gnuplot/electron.dem
-share/doc/gnuplot/fit.dem
-share/doc/gnuplot/glass.dat
-share/doc/gnuplot/gnuplot.rot
-share/doc/gnuplot/hemisphr.dat
-share/doc/gnuplot/hexa.fnc
-share/doc/gnuplot/hidden.dem
-share/doc/gnuplot/klein.dat
-share/doc/gnuplot/lcdemo.dat
-share/doc/gnuplot/line.fnc
-share/doc/gnuplot/mgr.dem
-share/doc/gnuplot/moli3.dat
-share/doc/gnuplot/multimsh.dem
-share/doc/gnuplot/multiplt.dem
-share/doc/gnuplot/param.dem
-share/doc/gnuplot/polar.dem
-share/doc/gnuplot/poldat.dem
-share/doc/gnuplot/prob.dem
-share/doc/gnuplot/prob2.dem
-share/doc/gnuplot/random.dem
-share/doc/gnuplot/reflect.fnc
-share/doc/gnuplot/reread.bor
-share/doc/gnuplot/scatter.dem
-share/doc/gnuplot/scatter2.dat
-share/doc/gnuplot/silver.dat
-share/doc/gnuplot/simple.dem
-share/doc/gnuplot/singulr.dem
-share/doc/gnuplot/sound.par
-share/doc/gnuplot/sound2.par
-share/doc/gnuplot/soundvel.dat
-share/doc/gnuplot/spline.dem
-share/doc/gnuplot/start.par
-share/doc/gnuplot/stat.inc
-share/doc/gnuplot/steps.dat
-share/doc/gnuplot/steps.dem
-share/doc/gnuplot/surface1.dem
-share/doc/gnuplot/surface2.dem
-share/doc/gnuplot/timedat.dat
-share/doc/gnuplot/timedat.dem
-share/doc/gnuplot/using.dat
-share/doc/gnuplot/using.dem
-share/doc/gnuplot/vector.dem
-share/doc/gnuplot/whale.dat
-share/doc/gnuplot/world.cor
-share/doc/gnuplot/world.dat
-share/doc/gnuplot/world.dem
-share/doc/gnuplot/binary1
-share/doc/gnuplot/binary2
-share/doc/gnuplot/binary3
-share/doc/gnuplot/README
-@dirrm share/doc/gnuplot
+bin/lasergnu
+%%PORTDOCS%%@unexec install-info --delete %D/info/gnuplot.info %D/info/dir
+%%PORTDOCS%%info/gnuplot.info
+%%PORTDOCS%%@exec install-info %D/info/gnuplot.info %D/info/dir
+%%PORTDOCS%%share/examples/gnuplot/1.dat
+%%PORTDOCS%%share/examples/gnuplot/2.dat
+%%PORTDOCS%%share/examples/gnuplot/3.dat
+%%PORTDOCS%%share/examples/gnuplot/README
+%%PORTDOCS%%share/examples/gnuplot/airfoil.dem
+%%PORTDOCS%%share/examples/gnuplot/all.dem
+%%PORTDOCS%%share/examples/gnuplot/animate.dem
+%%PORTDOCS%%share/examples/gnuplot/battery.dat
+%%PORTDOCS%%share/examples/gnuplot/big_peak.dat
+%%PORTDOCS%%share/examples/gnuplot/binary.dem
+%%PORTDOCS%%share/examples/gnuplot/binary1
+%%PORTDOCS%%share/examples/gnuplot/binary2
+%%PORTDOCS%%share/examples/gnuplot/binary3
+%%PORTDOCS%%share/examples/gnuplot/bivariat.dem
+%%PORTDOCS%%share/examples/gnuplot/borders.dem
+%%PORTDOCS%%share/examples/gnuplot/contours.dem
+%%PORTDOCS%%share/examples/gnuplot/controls.dem
+%%PORTDOCS%%share/examples/gnuplot/density.fnc
+%%PORTDOCS%%share/examples/gnuplot/discrete.dem
+%%PORTDOCS%%share/examples/gnuplot/electron.dem
+%%PORTDOCS%%share/examples/gnuplot/fit.dem
+%%PORTDOCS%%share/examples/gnuplot/glass.dat
+%%PORTDOCS%%share/examples/gnuplot/gnuplot.rot
+%%PORTDOCS%%share/examples/gnuplot/hemisphr.dat
+%%PORTDOCS%%share/examples/gnuplot/hexa.fnc
+%%PORTDOCS%%share/examples/gnuplot/hidden.dem
+%%PORTDOCS%%share/examples/gnuplot/klein.dat
+%%PORTDOCS%%share/examples/gnuplot/lcdemo.dat
+%%PORTDOCS%%share/examples/gnuplot/line.fnc
+%%PORTDOCS%%share/examples/gnuplot/mgr.dem
+%%PORTDOCS%%share/examples/gnuplot/moli3.dat
+%%PORTDOCS%%share/examples/gnuplot/multimsh.dem
+%%PORTDOCS%%share/examples/gnuplot/multiplt.dem
+%%PORTDOCS%%share/examples/gnuplot/param.dem
+%%PORTDOCS%%share/examples/gnuplot/polar.dem
+%%PORTDOCS%%share/examples/gnuplot/poldat.dem
+%%PORTDOCS%%share/examples/gnuplot/prob.dem
+%%PORTDOCS%%share/examples/gnuplot/prob2.dem
+%%PORTDOCS%%share/examples/gnuplot/random.dem
+%%PORTDOCS%%share/examples/gnuplot/reflect.fnc
+%%PORTDOCS%%share/examples/gnuplot/reread.bor
+%%PORTDOCS%%share/examples/gnuplot/scatter.dem
+%%PORTDOCS%%share/examples/gnuplot/scatter2.dat
+%%PORTDOCS%%share/examples/gnuplot/silver.dat
+%%PORTDOCS%%share/examples/gnuplot/simple.dem
+%%PORTDOCS%%share/examples/gnuplot/singulr.dem
+%%PORTDOCS%%share/examples/gnuplot/sound.par
+%%PORTDOCS%%share/examples/gnuplot/sound2.par
+%%PORTDOCS%%share/examples/gnuplot/soundvel.dat
+%%PORTDOCS%%share/examples/gnuplot/spline.dem
+%%PORTDOCS%%share/examples/gnuplot/start.par
+%%PORTDOCS%%share/examples/gnuplot/stat.inc
+%%PORTDOCS%%share/examples/gnuplot/steps.dat
+%%PORTDOCS%%share/examples/gnuplot/steps.dem
+%%PORTDOCS%%share/examples/gnuplot/surface1.dem
+%%PORTDOCS%%share/examples/gnuplot/surface2.dem
+%%PORTDOCS%%share/examples/gnuplot/timedat.dat
+%%PORTDOCS%%share/examples/gnuplot/timedat.dem
+%%PORTDOCS%%share/examples/gnuplot/using.dat
+%%PORTDOCS%%share/examples/gnuplot/using.dem
+%%PORTDOCS%%share/examples/gnuplot/vector.dem
+%%PORTDOCS%%share/examples/gnuplot/whale.dat
+%%PORTDOCS%%share/examples/gnuplot/world.cor
+%%PORTDOCS%%share/examples/gnuplot/world.dat
+%%PORTDOCS%%share/examples/gnuplot/world.dem
+%%PORTDOCS%%@dirrm share/examples/gnuplot
+%%PORTDOCS%%share/gnuplot/gnuplot.gih
+%%PORTDOCS%%@dirrm share/gnuplot