Attachment #129392 for bug #173369





PORTNAME=	gnuplot371+
PORTVERSION=	1.2.0
PORTREVISION=	9
CATEGORIES=	math japanese graphics
MASTER_SITES=	SF/gnuplot/gnuplot/3.7.1 \
		http://www.yama-ga.com/gnuplot/:patch \
		http://www.h2.dion.ne.jp/~yamaga/gnuplot/:patch

DISTFILES=	gnuplot-3.7.1.tar.gz \
		gnuplot3.7.1+${PORTVERSION}.patch.tar.gz:patch
EXTRACT_ONLY=	gnuplot-3.7.1.tar.gz

COMMENT=	A command-driven interactive function plotting program

LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
		VFlib2:${PORTSDIR}/japanese/vflib

USE_XORG=	x11
USE_FREETYPE=	yes

		--with-readline=gnu --with-lasergnu --with-png \
		--with-vflib=${LOCALBASE}/lib

MAN1=		gnuplot+.1 lasergnu+.1
INFO=		gnuplot+

WRKSRC=		${WRKDIR}/gnuplot-3.7.1
GP_DOCS=	${WRKSRC}/Copyright.plus \

post-install:
	@test -d ${PREFIX}/share/doc/gnuplot+ || ${MKDIR} ${PREFIX}/share/doc/gnuplot+
	${INSTALL_DATA} ${GP_DOCS} ${PREFIX}/share/doc/gnuplot+
	${INSTALL_DATA} ${WRKSRC}/docs/gnuplot+.info ${PREFIX}/info
	${MKDIR} ${PREFIX}/share/examples/gnuplot+
	${INSTALL_DATA} ${WRKSRC}/demo/* ${PREFIX}/share/examples/gnuplot+





--- Makefile.in.orig	2012-11-04 14:46:59.000000000 +0900
+++ Makefile.in	2012-11-04 14:53:18.000000000 +0900
@@ -35,7 +35,7 @@
 VPATH = @srcdir@
 @SET_MAKE@
 
-HELPFILE=$(datadir)/%L/gnuplot.gih
+HELPFILE=$(datadir)/%L/gnuplot+.gih
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -362,21 +362,21 @@
 	$(srcdir)/mkinstalldirs $(bindir)
 	$(srcdir)/mkinstalldirs $(datadir)
 	$(srcdir)/mkinstalldirs $(mandir)/man1
-	$(INSTALL_PROGRAM) gnuplot $(bindir)/gnuplot
-	test ! -f gnuplot_x11 || $(INSTALL_PROGRAM) gnuplot_x11 $(bindir)/gnuplot_x11
-	-$(INSTALL_DATA) $(srcdir)/docs/gnuplot.1 $(mandir)/man1/gnuplot.1
+	$(INSTALL_PROGRAM) gnuplot $(bindir)/gnuplot+
+	test ! -f gnuplot_x11 || $(INSTALL_PROGRAM) gnuplot_x11 $(bindir)/gnuplot_x11+
+	-$(INSTALL_DATA) $(srcdir)/docs/gnuplot.1 $(mandir)/man1/gnuplot+.1
 	-cd docs && $(MAKE) $(MFLAGS) install
 	@LINUXSUID@
 
 lasergnu_install: lasergnu docs/lasergnu.1
-	$(INSTALL_SCRIPT) $(srcdir)/lasergnu $(bindir)/lasergnu
-	$(INSTALL_DATA) $(srcdir)/docs/lasergnu.1 $(mandir)/man1/lasergnu.1
+	$(INSTALL_SCRIPT) $(srcdir)/lasergnu $(bindir)/lasergnu+
+	$(INSTALL_DATA) $(srcdir)/docs/lasergnu.1 $(mandir)/man1/lasergnu+.1
 
 lasergnu_noinstall:
 
 uninstall:
-	rm -f $(bindir)/gnuplot $(bindir)/gnuplot_x11
-	rm -f $(mandir)/man1/gnuplot.1 $(mandir)/man1/lasergnu.1
+	rm -f $(bindir)/gnuplot+ $(bindir)/gnuplot_x11+
+	rm -f $(mandir)/man1/gnuplot+.1 $(mandir)/man1/lasergnu+.1
 	cd docs && $(MAKE) $(MFLAGS)
 
 ################################################################
@@ -395,7 +395,7 @@
 	( cd $(GPPLUSDIR); $(MAKE) $(MFLAGS) )
 
 doc:
-	cd docs && $(MAKE) $(MFLAGS) gnuplot.gih
+	cd docs && $(MAKE) $(MFLAGS) gnuplot+.gih
 
 demo/binary1 demo/binary2 demo/binary3: bf_test
 	wd=`pwd` && cd $(srcdir)/demo && $$wd/bf_test
@@ -431,32 +431,6 @@
 #$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 #	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): configure.in m4/msdos.m4 m4/next.m4 m4/path-hdr.m4 \
-		m4/path-lib.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-$(CONFIG_HEADER): stamp-h
-	@:
-stamp-h: $(srcdir)/$(CONFIG_HEADER_IN) $(top_builddir)/config.status
-	cd $(top_builddir) \
-	&& CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER)
-	   $(SHELL) ./config.status
-	@echo timestamp > stamp-h
-
-$(srcdir)/$(CONFIG_HEADER_IN): stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
 
 ################################################################
 # Miscellaneous targets




--- docs/Makefile.in.orig	1999-11-01 21:25:16.000000000 +0900
+++ docs/Makefile.in	2012-11-05 13:38:05.557042555 +0900
@@ -34,7 +34,7 @@
 #
 
 # default is what is needed for interactive gnuplot
-all: gnuplot.gih
+all: gnuplot+.gih
 
 # this tells GNU make not to export variables into the environment
 # But other makes dont understand its significance, so it must
@@ -253,18 +253,18 @@
 # this is how to make gnuplot.hlp
 hlp: gnuplot.hlp
 
-gnuplot.hlp: doc2hlp $(srcdir)/gnuplot.doc
-	./doc2hlp $(srcdir)/gnuplot.doc gnuplot.hlp
+gnuplot+.hlp: doc2hlp $(srcdir)/gnuplot.doc
+	./doc2hlp $(srcdir)/gnuplot.doc gnuplot+.hlp
 
 doc2hlp: doc2hlp.o termdoc.o
 	$(LINK) doc2hlp.o termdoc.o $(LIBS)
 
 ### gnuplot interactive help format
-gih: gnuplot.gih
+gih: gnuplot+.gih
 
-gnuplot.gih: doc2gih $(srcdir)/gnuplot.doc
+gnuplot+.gih: doc2gih $(srcdir)/gnuplot.doc
 	@rm -f alldoc2gih
-	./doc2gih $(srcdir)/gnuplot.doc gnuplot.gih
+	./doc2gih $(srcdir)/gnuplot.doc gnuplot+.gih
 
 doc2gih: doc2gih.o termdoc.o
 	$(LINK) doc2gih.o termdoc.o $(LIBS)
@@ -272,7 +272,7 @@
 # To include all terminals in the .gih file
 allgih: alldoc2gih $(srcdir)/gnuplot.doc
 	@rm -f doc2gih
-	./alldoc2gih $(srcdir)/gnuplot.doc gnuplot.gih
+	./alldoc2gih $(srcdir)/gnuplot.doc gnuplot+.gih
 
 alldoc2gih: alldoc2gih.o termdoc.o
 	$(LINK) alldoc2gih.o termdoc.o $(LIBS)
@@ -282,10 +282,10 @@
 	@mv doc2gih.o alldoc2gih.o
 
 ### GNU info format
-info: gnuplot.info
+info: gnuplot+.info
 
-gnuplot.info: doc2info $(srcdir)/gnuplot.doc
-	./doc2info $(srcdir)/gnuplot.doc gnuplot.info
+gnuplot+.info: doc2info $(srcdir)/gnuplot.doc
+	./doc2info $(srcdir)/gnuplot.doc gnuplot+.info
 
 doc2info: doc2info.o termdoc.o xref.o
 	$(LINK) doc2info.o termdoc.o xref.o $(LIBS)
@@ -348,12 +348,12 @@
 	$(COMPILE) -DALL_TERM_DOC -c $(srcdir)/checkdoc.c
 
 # For Unix and MSDOS only
-install: gnuplot.gih
+install: gnuplot+.gih
 	$(top_srcdir)/mkinstalldirs $(datadir)
-	$(INSTALL_DATA) gnuplot.gih $(datadir)/gnuplot.gih
+	$(INSTALL_DATA) gnuplot+.gih $(datadir)/gnuplot+.gih
 
 uninstall:
-	rm -f $(datadir)/gnuplot.gih
+	rm -f $(datadir)/gnuplot+.gih
 
 # for VMS only
 install-vms: gnuplot.hlp
@@ -381,10 +381,10 @@
 	-rm -f doc2tex gnuplot.tex gnuplot.dvi \
 	  gnuplot.aux gnuplot.log gnuplot.toc \
 	  gnuplot.ps gpcard.dvi gpcard.log gpcard.ps \
-	  alldoc2gih doc2gih gnuplot.gih \
+	  alldoc2gih doc2gih gnuplot+.gih \
 	  doc2hlp gnuplot.hlp \
 	  doc2html gnuplot.html \
-	  doc2info gnuplot.info* gpltinfo.tex \
+	  doc2info gnuplot+.info* gpltinfo.tex \
 	  doc2ipf gnuplot.ipf \
 	  doc2ms gnuplot.ms \
 	  doc2rnh gnuplot.rnh \




--- lasergnu.orig	1998-04-16 04:16:31.000000000 +0900
+++ lasergnu	2012-11-05 13:09:34.302043977 +0900
@@ -53,7 +53,7 @@
                 shift argv
             else
                 echo "Usage: -f file ..."
-                echo "Type    lasergnu -help    for help."
+                echo "Type    lasergnu+ -help    for help."
                 exit (1)
             endif
             goto top
@@ -70,7 +70,7 @@
                               shift argv
                       else
                               echo "Usage: -F font"
-                              echo "Type    lasergnu -help    for help."
+                              echo "Type    lasergnu+ -help    for help."
                               exit (1)
                       endif
                       goto top
@@ -87,7 +87,7 @@
                 shift argv
             else
                 echo "Usage: -t title ..."
-                echo "Type    lasergnu -help    for help."
+                echo "Type    lasergnu+ -help    for help."
                 exit (1)
             endif
             goto top
@@ -106,7 +106,7 @@
                 shift argv
             else
                 echo "Usage: -P printer ..."
-                echo "Type    lasergnu -help    for help."
+                echo "Type    lasergnu+ -help    for help."
                 exit (1)
             endif
             goto top
@@ -136,7 +136,7 @@
 				shift argv
 			else
 				echo "Usage: -s xscale,yscale"
-				echo "Type    lasergnu -help    for help."
+				echo "Type    lasergnu+ -help    for help."
 				exit (1)
 			endif
 			goto top
@@ -153,7 +153,7 @@
 				shift argv
 			else
 				echo "Usage: -w horiz,vertical"
-				echo "Type    lasergnu -help    for help."
+				echo "Type    lasergnu+ -help    for help."
 				exit (1)
 			endif
 			goto top
@@ -205,12 +205,12 @@
         /usr/local/bin/ipr $LANG $printer \
            -D"jobheader $print_banner" \
            -D"pagereversal on" \
-           -D"program lasergnu" $outfile
+           -D"program lasergnu+" $outfile
     else if ($LANG == -Lpostscript) then
            lpr $lpr_opts $printer $outfile
     endif
 else
-    echo "lasergnu: error in plotting or empty plot; nothing printed."
+    echo "lasergnu+: error in plotting or empty plot; nothing printed."
 endif
 
 cleanup:
@@ -218,7 +218,7 @@
 exit
 
 usage:
-echo "usage: lasergnu [-Pprinter] [-F font] [-w nx,ny ] [-s xscale,yscale][-b] [-O] [-p] [-t title] [-f file] ['plot command']...."
+echo "usage: lasergnu+ [-Pprinter] [-F font] [-w nx,ny ] [-s xscale,yscale][-b] [-O] [-p] [-t title] [-f file] ['plot command']...."
 echo "  -O           : Orientation Portrait (default is Landscape)"
 echo "  -F font      : fontsize in points for imagen"
 echo "  -w nx,ny     : split page (nx and ny: no. plots horizontal and vertical)"

Line 0 Link Here

(-)./files/patch-term:x11.trm (+11 lines)
	1	--- term/x11.trm.orig 2012-02-16 08:15:08.000000000 +0900
	2	+++ term/x11.trm 2012-02-16 08:15:31.000000000 +0900
	3	@@ -137,7 +137,7 @@
	4	# ifdef OS2
	5	static char X11_command[] = "gnuplot_x11.exe";
	6	# else
	7	-static char X11_command[] = "gnuplot_x11";
	8	+static char X11_command[] = "gnuplot_x11+";
	9	# endif /* !OS/2 */
	10
	11	/* X11_args - scan gnuplot command line for standard X Toolkit options

Lines 1-7 Link Here

(-)./pkg-plist (-4 / +4 lines)
1	bin/lasergnu	1	bin/lasergnu+
2	bin/gnuplot	2	bin/gnuplot+
3	bin/gnuplot_x11	3	bin/gnuplot_x11+
4	share/gnuplot.gih	4	share/gnuplot+.gih
5	share/doc/gnuplot+/Copyright.plus	5	share/doc/gnuplot+/Copyright.plus
6	share/doc/gnuplot+/History.plus	6	share/doc/gnuplot+/History.plus
7	share/doc/gnuplot+/INSTALL-J.unx.plus	7	share/doc/gnuplot+/INSTALL-J.unx.plus

Return to bug 173369

Lines 7-18 Link Here

(-)./Makefile (-6 / +5 lines)
7		7
8	PORTNAME= gnuplot371+	8	PORTNAME= gnuplot371+
9	PORTVERSION= 1.2.0	9	PORTVERSION= 1.2.0
10	PORTREVISION= 8	10	PORTREVISION= 9
11	CATEGORIES= math japanese graphics	11	CATEGORIES= math japanese graphics
12	MASTER_SITES= SF/gnuplot/gnuplot/3.7.1 \	12	MASTER_SITES= SF/gnuplot/gnuplot/3.7.1 \
13	http://www.yama-ga.com/gnuplot/:patch \	13	http://www.yama-ga.com/gnuplot/:patch \
14	http://www.h2.dion.ne.jp/~yamaga/gnuplot/:patch	14	http://www.h2.dion.ne.jp/~yamaga/gnuplot/:patch
15
16	DISTFILES= gnuplot-3.7.1.tar.gz \	15	DISTFILES= gnuplot-3.7.1.tar.gz \
17	gnuplot3.7.1+${PORTVERSION}.patch.tar.gz:patch	16	gnuplot3.7.1+${PORTVERSION}.patch.tar.gz:patch
18	EXTRACT_ONLY= gnuplot-3.7.1.tar.gz	17	EXTRACT_ONLY= gnuplot-3.7.1.tar.gz
Lines 21-27 Link Here
21	COMMENT= A command-driven interactive function plotting program	20	COMMENT= A command-driven interactive function plotting program
22		21
23	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \	22	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
24	VFlib2.24:${PORTSDIR}/japanese/vflib	23	VFlib2:${PORTSDIR}/japanese/vflib
25		24
26	USE_XORG= x11	25	USE_XORG= x11
27	USE_FREETYPE= yes	26	USE_FREETYPE= yes
Lines 36-43 Link Here
36	--with-readline=gnu --with-lasergnu --with-png \	35	--with-readline=gnu --with-lasergnu --with-png \
37	--with-vflib=${LOCALBASE}/lib	36	--with-vflib=${LOCALBASE}/lib
38		37
39	MAN1= gnuplot.1 lasergnu.1	38	MAN1= gnuplot+.1 lasergnu+.1
40	INFO= gnuplot	39	INFO= gnuplot+
41		40
42	WRKSRC= ${WRKDIR}/gnuplot-3.7.1	41	WRKSRC= ${WRKDIR}/gnuplot-3.7.1
43	GP_DOCS= ${WRKSRC}/Copyright.plus \	42	GP_DOCS= ${WRKSRC}/Copyright.plus \
Lines 72-78 Link Here
72	post-install:	71	post-install:
73	@test -d ${PREFIX}/share/doc/gnuplot+ \|\| ${MKDIR} ${PREFIX}/share/doc/gnuplot+	72	@test -d ${PREFIX}/share/doc/gnuplot+ \|\| ${MKDIR} ${PREFIX}/share/doc/gnuplot+
74	${INSTALL_DATA} ${GP_DOCS} ${PREFIX}/share/doc/gnuplot+	73	${INSTALL_DATA} ${GP_DOCS} ${PREFIX}/share/doc/gnuplot+
75	${INSTALL_DATA} ${WRKSRC}/docs/gnuplot.info ${PREFIX}/info	74	${INSTALL_DATA} ${WRKSRC}/docs/gnuplot+.info ${PREFIX}/info
76	${MKDIR} ${PREFIX}/share/examples/gnuplot+	75	${MKDIR} ${PREFIX}/share/examples/gnuplot+
77	${INSTALL_DATA} ${WRKSRC}/demo/* ${PREFIX}/share/examples/gnuplot+	76	${INSTALL_DATA} ${WRKSRC}/demo/* ${PREFIX}/share/examples/gnuplot+
78		77

Line 0 Link Here

(-)./files/patch-Makefile.in (+82 lines)
		1	--- Makefile.in.orig 2012-11-04 14:46:59.000000000 +0900
		2	+++ Makefile.in 2012-11-04 14:53:18.000000000 +0900
		3	@@ -35,7 +35,7 @@
		4	VPATH = @srcdir@
		5	@SET_MAKE@
		6
		7	-HELPFILE=$(datadir)/%L/gnuplot.gih
		8	+HELPFILE=$(datadir)/%L/gnuplot+.gih
		9
		10	INSTALL = @INSTALL@
		11	INSTALL_PROGRAM = @INSTALL_PROGRAM@
		12	@@ -362,21 +362,21 @@
		13	$(srcdir)/mkinstalldirs $(bindir)
		14	$(srcdir)/mkinstalldirs $(datadir)
		15	$(srcdir)/mkinstalldirs $(mandir)/man1
		16	- $(INSTALL_PROGRAM) gnuplot $(bindir)/gnuplot
		17	- test ! -f gnuplot_x11 \|\| $(INSTALL_PROGRAM) gnuplot_x11 $(bindir)/gnuplot_x11
		18	- -$(INSTALL_DATA) $(srcdir)/docs/gnuplot.1 $(mandir)/man1/gnuplot.1
		19	+ $(INSTALL_PROGRAM) gnuplot $(bindir)/gnuplot+
		20	+ test ! -f gnuplot_x11 \|\| $(INSTALL_PROGRAM) gnuplot_x11 $(bindir)/gnuplot_x11+
		21	+ -$(INSTALL_DATA) $(srcdir)/docs/gnuplot.1 $(mandir)/man1/gnuplot+.1
		22	-cd docs && $(MAKE) $(MFLAGS) install
		23	@LINUXSUID@
		24
		25	lasergnu_install: lasergnu docs/lasergnu.1
		26	- $(INSTALL_SCRIPT) $(srcdir)/lasergnu $(bindir)/lasergnu
		27	- $(INSTALL_DATA) $(srcdir)/docs/lasergnu.1 $(mandir)/man1/lasergnu.1
		28	+ $(INSTALL_SCRIPT) $(srcdir)/lasergnu $(bindir)/lasergnu+
		29	+ $(INSTALL_DATA) $(srcdir)/docs/lasergnu.1 $(mandir)/man1/lasergnu+.1
		30
		31	lasergnu_noinstall:
		32
		33	uninstall:
		34	- rm -f $(bindir)/gnuplot $(bindir)/gnuplot_x11
		35	- rm -f $(mandir)/man1/gnuplot.1 $(mandir)/man1/lasergnu.1
		36	+ rm -f $(bindir)/gnuplot+ $(bindir)/gnuplot_x11+
		37	+ rm -f $(mandir)/man1/gnuplot+.1 $(mandir)/man1/lasergnu+.1
		38	cd docs && $(MAKE) $(MFLAGS)
		39
		40	################################################################
		41	@@ -395,7 +395,7 @@
		42	( cd $(GPPLUSDIR); $(MAKE) $(MFLAGS) )
		43
		44	doc:
		45	- cd docs && $(MAKE) $(MFLAGS) gnuplot.gih
		46	+ cd docs && $(MAKE) $(MFLAGS) gnuplot+.gih
		47
		48	demo/binary1 demo/binary2 demo/binary3: bf_test
		49	wd=`pwd` && cd $(srcdir)/demo && $$wd/bf_test
		50	@@ -431,32 +431,6 @@
		51	#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
		52	# cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
		53
		54	-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
		55	- cd $(top_builddir) \
		56	- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
		57	-
		58	-$(ACLOCAL_M4): configure.in m4/msdos.m4 m4/next.m4 m4/path-hdr.m4 \
		59	- m4/path-lib.m4
		60	- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
		61	-
		62	-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
		63	- $(SHELL) ./config.status --recheck
		64	-
65	-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
66	- cd $(srcdir) && $(AUTOCONF)
67	-
68	-$(CONFIG_HEADER): stamp-h
69	- @:
70	-stamp-h: $(srcdir)/$(CONFIG_HEADER_IN) $(top_builddir)/config.status
71	- cd $(top_builddir) \
72	- && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER)
73	- $(SHELL) ./config.status
74	- @echo timestamp > stamp-h
75	-
76	-$(srcdir)/$(CONFIG_HEADER_IN): stamp-h.in
77	-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
78	- cd $(top_srcdir) && $(AUTOHEADER)
79	- @echo timestamp > $(srcdir)/stamp-h.in
80
81	################################################################
82	# Miscellaneous targets

Line 0 Link Here

(-)./files/patch-docs:Makefile.in (+87 lines)
		1	--- docs/Makefile.in.orig 1999-11-01 21:25:16.000000000 +0900
		2	+++ docs/Makefile.in 2012-11-05 13:38:05.557042555 +0900
		3	@@ -34,7 +34,7 @@
		4	#
		5
		6	# default is what is needed for interactive gnuplot
		7	-all: gnuplot.gih
		8	+all: gnuplot+.gih
		9
		10	# this tells GNU make not to export variables into the environment
		11	# But other makes dont understand its significance, so it must
		12	@@ -253,18 +253,18 @@
		13	# this is how to make gnuplot.hlp
		14	hlp: gnuplot.hlp
		15
		16	-gnuplot.hlp: doc2hlp $(srcdir)/gnuplot.doc
		17	- ./doc2hlp $(srcdir)/gnuplot.doc gnuplot.hlp
		18	+gnuplot+.hlp: doc2hlp $(srcdir)/gnuplot.doc
		19	+ ./doc2hlp $(srcdir)/gnuplot.doc gnuplot+.hlp
		20
		21	doc2hlp: doc2hlp.o termdoc.o
		22	$(LINK) doc2hlp.o termdoc.o $(LIBS)
		23
		24	### gnuplot interactive help format
		25	-gih: gnuplot.gih
		26	+gih: gnuplot+.gih
		27
		28	-gnuplot.gih: doc2gih $(srcdir)/gnuplot.doc
		29	+gnuplot+.gih: doc2gih $(srcdir)/gnuplot.doc
		30	@rm -f alldoc2gih
		31	- ./doc2gih $(srcdir)/gnuplot.doc gnuplot.gih
		32	+ ./doc2gih $(srcdir)/gnuplot.doc gnuplot+.gih
		33
		34	doc2gih: doc2gih.o termdoc.o
		35	$(LINK) doc2gih.o termdoc.o $(LIBS)
		36	@@ -272,7 +272,7 @@
		37	# To include all terminals in the .gih file
		38	allgih: alldoc2gih $(srcdir)/gnuplot.doc
		39	@rm -f doc2gih
		40	- ./alldoc2gih $(srcdir)/gnuplot.doc gnuplot.gih
		41	+ ./alldoc2gih $(srcdir)/gnuplot.doc gnuplot+.gih
		42
		43	alldoc2gih: alldoc2gih.o termdoc.o
		44	$(LINK) alldoc2gih.o termdoc.o $(LIBS)
		45	@@ -282,10 +282,10 @@
		46	@mv doc2gih.o alldoc2gih.o
		47
		48	### GNU info format
		49	-info: gnuplot.info
		50	+info: gnuplot+.info
		51
		52	-gnuplot.info: doc2info $(srcdir)/gnuplot.doc
		53	- ./doc2info $(srcdir)/gnuplot.doc gnuplot.info
		54	+gnuplot+.info: doc2info $(srcdir)/gnuplot.doc
		55	+ ./doc2info $(srcdir)/gnuplot.doc gnuplot+.info
		56
		57	doc2info: doc2info.o termdoc.o xref.o
		58	$(LINK) doc2info.o termdoc.o xref.o $(LIBS)
		59	@@ -348,12 +348,12 @@
		60	$(COMPILE) -DALL_TERM_DOC -c $(srcdir)/checkdoc.c
		61
		62	# For Unix and MSDOS only
		63	-install: gnuplot.gih
		64	+install: gnuplot+.gih
65	$(top_srcdir)/mkinstalldirs $(datadir)
66	- $(INSTALL_DATA) gnuplot.gih $(datadir)/gnuplot.gih
67	+ $(INSTALL_DATA) gnuplot+.gih $(datadir)/gnuplot+.gih
68
69	uninstall:
70	- rm -f $(datadir)/gnuplot.gih
71	+ rm -f $(datadir)/gnuplot+.gih
72
73	# for VMS only
74	install-vms: gnuplot.hlp
75	@@ -381,10 +381,10 @@
76	-rm -f doc2tex gnuplot.tex gnuplot.dvi \
77	gnuplot.aux gnuplot.log gnuplot.toc \
78	gnuplot.ps gpcard.dvi gpcard.log gpcard.ps \
79	- alldoc2gih doc2gih gnuplot.gih \
80	+ alldoc2gih doc2gih gnuplot+.gih \
81	doc2hlp gnuplot.hlp \
82	doc2html gnuplot.html \
83	- doc2info gnuplot.info* gpltinfo.tex \
84	+ doc2info gnuplot+.info* gpltinfo.tex \
85	doc2ipf gnuplot.ipf \
86	doc2ms gnuplot.ms \
87	doc2rnh gnuplot.rnh \

Line 0 Link Here

(-)./files/patch-lasergnu (+80 lines)
		1	--- lasergnu.orig 1998-04-16 04:16:31.000000000 +0900
		2	+++ lasergnu 2012-11-05 13:09:34.302043977 +0900
		3	@@ -53,7 +53,7 @@
		4	shift argv
		5	else
		6	echo "Usage: -f file ..."
		7	- echo "Type lasergnu -help for help."
		8	+ echo "Type lasergnu+ -help for help."
		9	exit (1)
		10	endif
		11	goto top
		12	@@ -70,7 +70,7 @@
		13	shift argv
		14	else
		15	echo "Usage: -F font"
		16	- echo "Type lasergnu -help for help."
		17	+ echo "Type lasergnu+ -help for help."
		18	exit (1)
		19	endif
		20	goto top
		21	@@ -87,7 +87,7 @@
		22	shift argv
		23	else
		24	echo "Usage: -t title ..."
		25	- echo "Type lasergnu -help for help."
		26	+ echo "Type lasergnu+ -help for help."
		27	exit (1)
		28	endif
		29	goto top
		30	@@ -106,7 +106,7 @@
		31	shift argv
		32	else
		33	echo "Usage: -P printer ..."
		34	- echo "Type lasergnu -help for help."
		35	+ echo "Type lasergnu+ -help for help."
		36	exit (1)
		37	endif
		38	goto top
		39	@@ -136,7 +136,7 @@
		40	shift argv
		41	else
		42	echo "Usage: -s xscale,yscale"
		43	- echo "Type lasergnu -help for help."
		44	+ echo "Type lasergnu+ -help for help."
		45	exit (1)
		46	endif
		47	goto top
		48	@@ -153,7 +153,7 @@
		49	shift argv
		50	else
		51	echo "Usage: -w horiz,vertical"
		52	- echo "Type lasergnu -help for help."
		53	+ echo "Type lasergnu+ -help for help."
		54	exit (1)
		55	endif
		56	goto top
		57	@@ -205,12 +205,12 @@
		58	/usr/local/bin/ipr $LANG $printer \
		59	-D"jobheader $print_banner" \
		60	-D"pagereversal on" \
		61	- -D"program lasergnu" $outfile
		62	+ -D"program lasergnu+" $outfile
		63	else if ($LANG == -Lpostscript) then
		64	lpr $lpr_opts $printer $outfile
65	endif
66	else
67	- echo "lasergnu: error in plotting or empty plot; nothing printed."
68	+ echo "lasergnu+: error in plotting or empty plot; nothing printed."
69	endif
70
71	cleanup:
72	@@ -218,7 +218,7 @@
73	exit
74
75	usage:
76	-echo "usage: lasergnu [-Pprinter] [-F font] [-w nx,ny ] [-s xscale,yscale][-b] [-O] [-p] [-t title] [-f file] ['plot command']...."
77	+echo "usage: lasergnu+ [-Pprinter] [-F font] [-w nx,ny ] [-s xscale,yscale][-b] [-O] [-p] [-t title] [-f file] ['plot command']...."
78	echo " -O : Orientation Portrait (default is Landscape)"
79	echo " -F font : fontsize in points for imagen"
80	echo " -w nx,ny : split page (nx and ny: no. plots horizontal and vertical)"