merge in my local changes while I was working on this port:
- enable SEPARATE_BUILD - patches for DESTDIR and a fix for separate building - add in missing PFRAG file
This commit is contained in:
brad
parent
540fb279a0
commit
e4e3f7f9fd
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2000/09/22 20:34:56 danh Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2000/09/22 21:27:29 brad Exp $
|
||||
|
||||
DISTNAME= gnuplot-3.7.1
|
||||
CATEGORIES= math graphics
|
||||
@ -9,9 +9,9 @@ MASTER_SITES= ftp://ftp.gnuplot.vt.edu/pub/gnuplot/ \
|
||||
${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= gnuplot
|
||||
|
||||
HOMEPAGE= http://www.gnuplot.org/
|
||||
LIB_DEPENDS= png.1::graphics/png
|
||||
|
||||
LIB_DEPENDS= png::graphics/png
|
||||
HOMEPAGE= http://www.gnuplot.org/
|
||||
|
||||
MAINTAINER= danh@openbsd.org
|
||||
|
||||
@ -23,15 +23,16 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
FLAVORS= no_x11
|
||||
FLAVOR?=
|
||||
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
CONFIGURE_ARGS+= --without-linux-vga --without-gd \
|
||||
--with-png --with-gnu-readline --with-lasergnu
|
||||
USE_GMAKE= Yes
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --without-linux-vga --without-gd \
|
||||
--with-gnu-readline --with-lasergnu
|
||||
|
||||
.if ${FLAVOR:L:Mno_x11}
|
||||
.if ${FLAVOR:L} == "no_x11"
|
||||
CONFIGURE_ARGS+= --without-x
|
||||
.else
|
||||
USE_X11= Yes
|
||||
CONFIGURE_ARGS+= --with-x
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
55
math/gnuplot/patches/patch-Makefile.in
Normal file
55
math/gnuplot/patches/patch-Makefile.in
Normal file
@ -0,0 +1,55 @@
|
||||
--- Makefile.in.orig Wed Oct 27 07:15:10 1999
|
||||
+++ Makefile.in Mon Sep 18 09:28:46 2000
|
||||
@@ -22,6 +22,8 @@
|
||||
PACKAGE=@PACKAGE@
|
||||
VERSION=@VERSION@
|
||||
|
||||
+DESTDIR =
|
||||
+
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
@@ -351,24 +353,24 @@
|
||||
################################################################
|
||||
|
||||
install: all $(LASERGNU)
|
||||
- $(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
|
||||
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
|
||||
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
|
||||
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
|
||||
+ $(INSTALL_PROGRAM) gnuplot $(DESTDIR)$(bindir)/gnuplot
|
||||
+ test ! -f gnuplot_x11 || $(INSTALL_PROGRAM) gnuplot_x11 $(DESTDIR)$(bindir)/gnuplot_x11
|
||||
+ -$(INSTALL_DATA) $(srcdir)/docs/gnuplot.1 $(DESTDIR)$(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 $(DESTDIR)$(bindir)/lasergnu
|
||||
+ $(INSTALL_DATA) $(srcdir)/docs/lasergnu.1 $(DESTDIR)$(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 $(DESTDIR)$(bindir)/gnuplot $(DESTDIR)$(bindir)/gnuplot_x11
|
||||
+ rm -f $(DESTDIR)$(mandir)/man1/gnuplot.1 $(DESTDIR)$(mandir)/man1/lasergnu.1
|
||||
cd docs && $(MAKE) $(MFLAGS)
|
||||
|
||||
################################################################
|
||||
@@ -387,7 +389,7 @@
|
||||
cd docs && $(MAKE) $(MFLAGS) gnuplot.gih
|
||||
|
||||
demo/binary1 demo/binary2 demo/binary3: bf_test
|
||||
- wd=`pwd` && cd $(srcdir)/demo && $$wd/bf_test
|
||||
+ ./bf_test
|
||||
|
||||
bf_test: bf_test.o binary.o alloc.o
|
||||
$(LINK) bf_test.o binary.o alloc.o $(LIBS)
|
||||
31
math/gnuplot/patches/patch-doc_Makefile.in
Normal file
31
math/gnuplot/patches/patch-doc_Makefile.in
Normal file
@ -0,0 +1,31 @@
|
||||
--- docs/Makefile.in.orig Mon Sep 18 08:49:22 2000
|
||||
+++ docs/Makefile.in Mon Sep 18 08:50:46 2000
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
+DESTDIR =
|
||||
+
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
@@ -349,15 +351,15 @@
|
||||
|
||||
# For Unix and MSDOS only
|
||||
install: gnuplot.gih
|
||||
- $(top_srcdir)/mkinstalldirs $(datadir)
|
||||
- $(INSTALL_DATA) gnuplot.gih $(datadir)/gnuplot.gih
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
|
||||
+ $(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(datadir)/gnuplot.gih
|
||||
|
||||
uninstall:
|
||||
- rm -f $(datadir)/gnuplot.gih
|
||||
+ rm -f $(DESTDIR)$(datadir)/gnuplot.gih
|
||||
|
||||
# for VMS only
|
||||
install-vms: gnuplot.hlp
|
||||
- $(INSTALL_DATA) gnuplot.hlp $(datadir)/gnuplot.hlp
|
||||
+ $(INSTALL_DATA) gnuplot.hlp $(DESTDIR)$(datadir)/gnuplot.hlp
|
||||
|
||||
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
||||
|
||||
2
math/gnuplot/pkg/PFRAG.no-no_x11
Normal file
2
math/gnuplot/pkg/PFRAG.no-no_x11
Normal file
@ -0,0 +1,2 @@
|
||||
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2000/09/22 21:27:30 brad Exp $
|
||||
bin/gnuplot_x11
|
||||
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2000/09/22 20:34:57 danh Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2000/09/22 21:27:30 brad Exp $
|
||||
bin/gnuplot
|
||||
!%%no_x11%%
|
||||
bin/lasergnu
|
||||
man/man1/gnuplot.1
|
||||
man/man1/lasergnu.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user