Save xmgr history part the last. Back to the first import of the

xmgr-4.1.1 port. The maintainer changed with Andreas' consent.

I'll remove print/xmgr in a couple of days when I'm sure there's
no other breakage. <:)

11 files changed, 232 insertions, 33 deletions

diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index a2c88e9d59a7..5c2d948036e0 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,28 +1,32 @@
 # New ports collection makefile for:	xmgr
-# Version required:	3.01pl8
+# Version required:	4.1.1
 # Date created:		So   2 Mär 1997 12:11:43 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.4 1998/04/30 08:37:07 tg Exp $
+# $Id: Makefile,v 1.5 1998/04/30 08:40:07 tg Exp $
 #
 
-DISTNAME=	xmgr-3.01
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications
+DISTNAME=	xmgr-4.1.1
+CATEGORIES=	math print
+MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/xmgr4/src/ \
+		ftp://fire.mpi-stuttgart.mpg.de/pub/mirror/xmgr4/src/ \
+		ftp://wauug.erols.com/pub/X-Windows/xmgr4/src/
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
-WRKSRC=			${WRKDIR}/xmgr-3.01pl8/src
-USE_IMAKE=		yes
-REQUIRES_MOTIF=		yes
-NO_INSTALL_MANPAGES=	yes
+BUILD_DEPENDS=	${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp \
+		${LOCALBASE}/lib/libmfhdf.a:${PORTSDIR}/graphics/hdf
+LIB_DEPENDS=	Xbae\\.6\\.:${PORTSDIR}/x11/xbae
 
-pre-extract:
-	@$(ECHO_MSG) "Xinside Motif ? Then put this into /etc/make.conf:"
-	@$(ECHO_MSG) "    MOTIFLIB=-L\${X11BASE}/lib -lXm -lXintl"
+USE_X11=	YES
+REQUIRE_MOTIF=	YES
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	-prefix=${X11BASE} \
+	--enable-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include \
+	--enable-extra-ldpath=${LOCALBASE}/lib --enable-libhelp \
+	--enable-mfhdf --enable-acegr-home=${X11BASE}/lib/X11/xmgr
 
-post-install:
-	@( cd ${X11BASE}/bin; ln -sf xmgr grbatch )
+ALL_TARGET=
+INSTALL_TARGET=	install links
 
 .include <bsd.port.mk>
diff --git a/math/xmgr/distinfo b/math/xmgr/distinfo
index bfc65cd1922e..9a92dd0bacde 100644
--- a/math/xmgr/distinfo
+++ b/math/xmgr/distinfo
@@ -1 +1 @@
-MD5 (xmgr-3.01.tar.gz) = 16fb861262b689dbda03ea12512b4376
+MD5 (xmgr-4.1.1.tar.gz) = 8591870278cb44ff72417d3a93cbc3e5
diff --git a/math/xmgr/files/freebsd b/math/xmgr/files/freebsd
new file mode 100644
index 000000000000..9bd25c68e66e
--- /dev/null
+++ b/math/xmgr/files/freebsd
@@ -0,0 +1,27 @@
+#**********************************
+#* FreeBSD with X11R6 and Motif 2.0 *
+#**********************************
+
+###############################
+# Compiler
+#
+CC="gcc"
+###############################
+
+###############################
+# C flags
+#
+CFLAGS="-Wall"
+###############################
+
+###############################
+# Misc optimization flags
+#
+OPTIMIZE="-O2"
+###############################
+
+###############################
+# Flags used for debugging
+#
+DEBUG="-g -O2"
+###############################
diff --git a/math/xmgr/files/mini-xmgr3.xpm b/math/xmgr/files/mini-xmgr3.xpm
new file mode 100644
index 000000000000..35b090764838
--- /dev/null
+++ b/math/xmgr/files/mini-xmgr3.xpm
diff --git a/math/xmgr/files/patch-aa b/math/xmgr/files/patch-aa
index 0b02624a3454..8a53f7dbacce 100644
--- a/math/xmgr/files/patch-aa
+++ b/math/xmgr/files/patch-aa
@@ -1,11 +1,45 @@
---- Imakefile.orig	Sat Nov 26 02:01:00 1994
-+++ Imakefile	Sun Mar  2 16:59:36 1997
-@@ -6,7 +6,7 @@
- # you may wish to change these
- ##################################
- XLIB = -lX11
--LOCAL_LIBRARIES = -lXm -lXt -lPW
-+LOCAL_LIBRARIES = $(MOTIFLIB) -lXt -lcompat -lXext
- LDLIBS = $(XLIB) -lm
- DEPLIBS = 
- #################################
+*** ../xmgr-4.1.1/configure     Mon Dec  1 02:09:24 1997
+--- ./configure Sun Jan 18 17:31:25 1998
+***************
+*** 626,631 ****
+--- 626,632 ----
+
+    case "${host}" in
+      i?86-*-linux-*) CONF_FILE="ix86-linux";;
++     i?86-*-freebsd*) CONF_FILE="freebsd";;
+      *-*-linux-*) CONF_FILE="linux";;
+      i?86-*-sco-*) CONF_FILE="ix86-sco";;
+      alpha-dec-osf4.*) CONF_FILE="alpha-osf4";;
+***************
+*** 4857,4863 ****
+    echo $ac_n "(cached) $ac_c" 1>&6
+  else
+    ac_save_LIBS="$LIBS"
+! LIBS="-ldf  $LIBS"
+  cat > conftest.$ac_ext <<EOF
+  #line 4863 "configure"
+  #include "confdefs.h"
+--- 4857,4863 ----
+    echo $ac_n "(cached) $ac_c" 1>&6
+  else
+    ac_save_LIBS="$LIBS"
+! LIBS="-lmfhdf -ldf -lz $LIBS"
+  cat > conftest.$ac_ext <<EOF
+  #line 4863 "configure"
+  #include "confdefs.h"
+***************
+*** 4881,4887 ****
+  fi
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    echo "$ac_t""yes" 1>&6
+!   NETCDF_LIBS="$NETCDF_LIBS -ldf"; cat >> confdefs.h <<\EOF
+  #define HAVE_MFHDF 1
+  EOF
+
+--- 4882,4888 ----
+  fi
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    echo "$ac_t""yes" 1>&6
+!   NETCDF_LIBS="$NETCDF_LIBS -lmfhdf -ldf -lz"; cat >> confdefs.h <<\EOF
+  #define HAVE_MFHDF 1
+  EOF
diff --git a/math/xmgr/files/patch-ab b/math/xmgr/files/patch-ab
new file mode 100644
index 000000000000..ebe57f87c5f4
--- /dev/null
+++ b/math/xmgr/files/patch-ab
@@ -0,0 +1,18 @@
+*** ../xmgr-4.1.1/examples/Makefile	Sun Jan 18 19:09:32 1998
+--- ./examples/Makefile			Sun Jan 18 19:10:16 1998
+***************
+*** 32,38 ****
+  install : $(EXAMPLES) $(DOTEST)
+  	$(MKINSTALLDIRS) $(GR_HOME)/examples
+  	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GR_HOME)/examples; done
+! 	$(INSTALL_PROGRAM) $(DOTEST) $(GR_HOME)/examples/$(DOTEST)
+
+  links : dummy
+
+--- 32,38 ----
+  install : $(EXAMPLES) $(DOTEST)
+  	$(MKINSTALLDIRS) $(GR_HOME)/examples
+  	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GR_HOME)/examples; done
+! 	install -c -o bin -g bin -m 555 $(DOTEST) $(GR_HOME)/examples/$(DOTEST)
+
+  links : dummy
diff --git a/math/xmgr/files/patch-ac b/math/xmgr/files/patch-ac
new file mode 100644
index 000000000000..47e9069442a0
--- /dev/null
+++ b/math/xmgr/files/patch-ac
@@ -0,0 +1,18 @@
+*** ../xmgr-4.1.1/auxiliary/Makefile	Sun Jan 18 19:12:42 1998
+--- ./auxiliary/Makefile		Sun Jan 18 19:13:16 1998
+***************
+*** 22,28 ****
+  install : $(AUXILIARIES) fdf2fit
+  	$(MKINSTALLDIRS) $(GR_HOME)/auxiliary
+  	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GR_HOME)/auxiliary; done
+! 	$(INSTALL_PROGRAM) fdf2fit $(GR_HOME)/auxiliary
+
+  tests : dummy
+
+--- 22,28 ----
+  install : $(AUXILIARIES) fdf2fit
+  	$(MKINSTALLDIRS) $(GR_HOME)/auxiliary
+  	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GR_HOME)/auxiliary; done
+! 	install -c -o bin -g bin -m 555 fdf2fit $(GR_HOME)/auxiliary
+
+  tests : dummy
diff --git a/math/xmgr/pkg-comment b/math/xmgr/pkg-comment
index d837973e5b7b..270d075dc2d2 100644
--- a/math/xmgr/pkg-comment
+++ b/math/xmgr/pkg-comment
@@ -1 +1 @@
-plotting tool for workstations
+A powerful XY plotting tool for workstations or X-terminals using X
diff --git a/math/xmgr/pkg-descr b/math/xmgr/pkg-descr
index 7ad7004c6a40..331ef5044903 100644
--- a/math/xmgr/pkg-descr
+++ b/math/xmgr/pkg-descr
@@ -1,6 +1,13 @@
-Xmgr Release v3.01 patchlevel #8
+xmgr is an XY plotting tool for workstations or X-terminals using X. A few of
+its features are:
 
-(C) COPYRIGHT 1991-1996 Paul J Turner
-All Rights Reserved
+    * User defined scaling, tick marks, labels, symbols, line styles, colors.
+    * Batch mode for unattended plotting.
+    * Read and write parameters used during a session.
+    * Polynomial regression, splines, running averages, DFT/FFT,
+	cross/auto-correlation.
+    * Hardcopy support for PostScript, HP-GL, and FrameMaker .mif format.
 
-This is xmgr Release 3.01pl8, a plotting tool for workstations using X/Motif.
+While xmgr has a convenient point-and-click interface, most parameter settings
+and operations are available through a command line interface (found in
+Data/Commands).
diff --git a/math/xmgr/pkg-plist b/math/xmgr/pkg-plist
index 810c8188dcae..66b1b277ebc0 100644
--- a/math/xmgr/pkg-plist
+++ b/math/xmgr/pkg-plist
@@ -1,2 +1,90 @@
+lib/X11/xmgr/auxiliary/README
+lib/X11/xmgr/auxiliary/fdf2fit
+lib/X11/xmgr/auxiliary/greg2jul.c
+lib/X11/xmgr/auxiliary/jul2greg.c
+lib/X11/xmgr/auxiliary/magic.xmgr
+lib/X11/xmgr/bin/xmgr
+lib/X11/xmgr/bin/grbatch
+lib/X11/xmgr/bin/grconvert
+lib/X11/xmgr/doc/CHANGES.html
+lib/X11/xmgr/doc/FAQ.html
+lib/X11/xmgr/doc/acegr_np.html
+lib/X11/xmgr/doc/commands.html
+lib/X11/xmgr/doc/data.html
+lib/X11/xmgr/doc/dblclick.html
+lib/X11/xmgr/doc/dlmodule.html
+lib/X11/xmgr/doc/edcrset.html
+lib/X11/xmgr/doc/file.html
+lib/X11/xmgr/doc/fonts.html
+lib/X11/xmgr/doc/graphops.html
+lib/X11/xmgr/doc/hotkeys.html
+lib/X11/xmgr/doc/intro.html
+lib/X11/xmgr/doc/main.html
+lib/X11/xmgr/doc/nohelp.html
+lib/X11/xmgr/doc/npipe.html
+lib/X11/xmgr/doc/options.html
+lib/X11/xmgr/doc/page.html
+lib/X11/xmgr/doc/plot.html
+lib/X11/xmgr/doc/points.html
+lib/X11/xmgr/doc/regions.html
+lib/X11/xmgr/doc/sets.html
+lib/X11/xmgr/doc/test_np.c
+lib/X11/xmgr/doc/testf_np.f
+lib/X11/xmgr/doc/trans.html
+lib/X11/xmgr/doc/usage.html
+lib/X11/xmgr/doc/view.html
+lib/X11/xmgr/doc/xmgr.html
+lib/X11/xmgr/examples/altaxis.par
+lib/X11/xmgr/examples/au.d
+lib/X11/xmgr/examples/axes.par
+lib/X11/xmgr/examples/bar.d
+lib/X11/xmgr/examples/bar2.d
+lib/X11/xmgr/examples/bars.d
+lib/X11/xmgr/examples/brw.dat
+lib/X11/xmgr/examples/co2.all
+lib/X11/xmgr/examples/co2.par
+lib/X11/xmgr/examples/dotest
+lib/X11/xmgr/examples/explain.par
+lib/X11/xmgr/examples/fills.dat
+lib/X11/xmgr/examples/graphs.par
+lib/X11/xmgr/examples/hilo.dat
+lib/X11/xmgr/examples/log.d
+lib/X11/xmgr/examples/logistic.d
+lib/X11/xmgr/examples/logtest.par
+lib/X11/xmgr/examples/manygraphs.d
+lib/X11/xmgr/examples/mlo.dat
+lib/X11/xmgr/examples/moresyms.dat
+lib/X11/xmgr/examples/props.gr
+lib/X11/xmgr/examples/regions.par
+lib/X11/xmgr/examples/slideshow.d
+lib/X11/xmgr/examples/stackedb.d
+lib/X11/xmgr/examples/symslines.dat
+lib/X11/xmgr/examples/tbar3.dat
+lib/X11/xmgr/examples/terr.d
+lib/X11/xmgr/examples/terr2.d
+lib/X11/xmgr/examples/test.com
+lib/X11/xmgr/examples/test.dat
+lib/X11/xmgr/examples/test1.par
+lib/X11/xmgr/examples/test2.d
+lib/X11/xmgr/examples/tfonts.par
+lib/X11/xmgr/examples/tforms.par
+lib/X11/xmgr/examples/times.dat
+lib/X11/xmgr/examples/tinset.d
+lib/X11/xmgr/examples/tlog.demo
+lib/X11/xmgr/examples/tmc.c
+lib/X11/xmgr/examples/tpipe.d
+lib/X11/xmgr/examples/tstack.dat
+lib/X11/xmgr/examples/txyr.dat
+lib/X11/xmgr/include/acegr_np.h
+lib/X11/xmgr/lib/libacegr_np.a
 bin/xmgr
 bin/grbatch
+bin/grconvert
+bin/fdf2fit
+@dirrm lib/X11/xmgr/auxiliary
+@dirrm lib/X11/xmgr/bin
+@dirrm lib/X11/xmgr/doc
+@dirrm lib/X11/xmgr/examples
+@dirrm lib/X11/xmgr/include
+@dirrm lib/X11/xmgr/lib
+@dirrm lib/X11/xmgr
diff --git a/math/xmgr/scripts/configure b/math/xmgr/scripts/configure
new file mode 100644
index 000000000000..8005e1c3a290
--- /dev/null
+++ b/math/xmgr/scripts/configure
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+cp ${FILESDIR}/freebsd ${WRKSRC}/conf/freebsd