ports/173369: [math/gnuplot+] avoid conflicts with math/gnuplot

NAKAJI Hiroyuki nakaji at jp.freebsd.org
Mon Nov 5 02:20:01 UTC 2012 

>Number:         173369
>Category:       ports
>Synopsis:       [math/gnuplot+] avoid conflicts with math/gnuplot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 05 02:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     NAKAJI Hiroyuki
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD jimmy.4407.kankyo-u.ac.jp 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #97: Thu Oct 25 14:27:13 JST 2012 root at jimmy.4407.kankyo-u.ac.jp:/usr/obj/usr/src/sys/JIMMY amd64


>Description:
	Some files such as gnuplot, gnuplot_x11 and so on are also
installed by math/gnuplot. To avoid these confliction, the names of these
files are modified with '+'. The build failure related with autotools is
also fixed.

>How-To-Repeat:
N/A

>Fix:

===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/Makefile ./Makefile
--- /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/Makefile	2012-11-05 10:44:02.000000000 +0900
+++ ./Makefile	2012-11-05 10:45:26.978039164 +0900
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnuplot371+
 PORTVERSION=	1.2.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math japanese graphics
 MASTER_SITES=	SF/gnuplot/gnuplot/3.7.1 \
 		http://www.yama-ga.com/gnuplot/:patch \
diff -ruN --exclude=CVS /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-Makefile.in	2012-11-04 15:49:09.808037017 +0900
@@ -0,0 +1,82 @@
+--- 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
diff -ruN --exclude=CVS /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/files/patch-docs:Makefile.in ./files/patch-docs:Makefile.in
--- /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/files/patch-docs:Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-docs:Makefile.in	2012-11-04 15:49:14.805035624 +0900
@@ -0,0 +1,60 @@
+--- docs/Makefile.in.orig	2012-02-16 00:33:31.000000000 +0900
++++ docs/Makefile.in	2012-02-16 00:32:38.000000000 +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)
+@@ -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
diff -ruN --exclude=CVS /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/files/patch-term:x11.trm ./files/patch-term:x11.trm
--- /usr/local/tinderbox/portstrees/FreeBSD/ports/math/gnuplot+/files/patch-term:x11.trm	1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-term:x11.trm	2012-11-04 15:49:22.668033966 +0900
@@ -0,0 +1,11 @@
+--- term/x11.trm.orig	2012-02-16 08:15:08.000000000 +0900
++++ term/x11.trm	2012-02-16 08:15:31.000000000 +0900
+@@ -137,7 +137,7 @@
+ # ifdef OS2
+ static char X11_command[] = "gnuplot_x11.exe";
+ # else
+-static char X11_command[] = "gnuplot_x11";
++static char X11_command[] = "gnuplot_x11+";
+ # endif /* !OS/2 */
+ 
+ /*   X11_args - scan gnuplot command line for standard X Toolkit options
===> Done



>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list