Update to version 3.3.3.

PR:		18117
Submitted by:	Mikhail Teterin <mi@aldan.algebra.com>

4 files changed, 47 insertions, 10 deletions

diff --git a/math/siag/Makefile b/math/siag/Makefile
index 7483bb85c729..2ec79cc55c01 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	siag
-PORTVERSION=	3.2.0
+PORTVERSION=	3.3.3
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.edu.stockholm.se/pub/siag/ \
 		ftp://ftp.icm.edu.pl/site/siag/
@@ -14,27 +14,28 @@ MASTER_SITES=	ftp://ftp.edu.stockholm.se/pub/siag/ \
 MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \
+		Magick:${PORTSDIR}/graphics/ImageMagick \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 		mswordview:${PORTSDIR}/textproc/mswordview \
 		catdoc:${PORTSDIR}/textproc/catdoc
 
 GNU_CONFIGURE=	yes
-MAKEFLAGS=	"-j 2"
+MAKE_ARGS=	"-j 2"
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -DX11BASE='\"${X11BASE}\"'
 
 .if defined(GUILE)
 LIB_DEPENDS+=	guile.6:${PORTSDIR}/lang/guile
 .endif
 
 .if !defined(NOGDBM)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
 CPPFLAGS+=	-DGDBM
 .endif
 
 .if !defined(NOT1)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libt1.a:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	t1:${PORTSDIR}/devel/t1lib
 .endif
 
 .if !defined(NOTCL)
@@ -50,14 +51,15 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
 
 USE_X_PREFIX=	yes
 
-MAN1=	xedplus.1 xfiler.1 gvu.1 siod.1 siag.1 pw.1 egon.1 dummy_plugin.1
+MAN1=	xedplus.1 xfiler.1 gvu.1 siod.1 siag.1 pw.1 egon.1 \
+	dummy_plugin.1 runcmd.1
 
 post-install:
 	# Examples  and  documentation went  into  ${PREFIX}/share/doc
 	# Note, that the Siag's wordprocessor. the Pathetic Writer (or
 	# pw)  is installed  in  ${PREFIX}/bin/pw.  Depending on  your
 	# users'  PATH  it  may  or  may  not  interfere  with  simple
-	# invocation of /usr/sbin/pw.
+	# invocation of pw(8) (which is in /usr/sbin).
 	@test -e ${PREFIX}/lib/X11/app-defaults/Siag && ${ECHO} \
 		"It seems, you have old app-defaults file(s) from Siag.\
 		 Consider removing it(them) if new siag fails to come up" |\
@@ -70,5 +72,9 @@ post-patch:
 		${MV} $$m $$m.orig; \
 		${SED} s@doc/siag@share/doc/siag@ < $$m.orig > $$m; \
 	done
+	# Fixing configure to look for Xaw3d instead of XawM
+	${MV} ${WRKSRC}/configure ${WRKSRC}/configure.XawM
+	${SED} s/XawM/Xaw3d/g < ${WRKSRC}/configure.XawM > ${WRKSRC}/configure
+	${CHMOD} +x ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/math/siag/distinfo b/math/siag/distinfo
index 99e438e31a83..f140a674f587 100644
--- a/math/siag/distinfo
+++ b/math/siag/distinfo
@@ -1 +1 @@
-MD5 (siag-3.2.0.tar.gz) = 5c68a568b4450e41f242d9ea873b7a01
+MD5 (siag-3.3.3.tar.gz) = 0c7e2e3c1221185c64d695175f211574
diff --git a/math/siag/files/patch-pw b/math/siag/files/patch-pw
new file mode 100644
index 000000000000..f86369df9c10
--- /dev/null
+++ b/math/siag/files/patch-pw
@@ -0,0 +1,28 @@
+--- xpw/window.c	Wed Mar 29 17:20:52 2000
++++ xpw/window.c	Thu Apr 20 09:00:18 2000
+@@ -1386,3 +1386,3 @@
+                 if (!fork()) {
+-                        execlp("pw", "Pw", filename, (char *)0);
++                        execlp(X11BASE"/bin/pw", "Pw", filename, (char *)0);
+                         exit(1);
+--- pw/pw.scm	Fri Apr 14 17:05:47 2000
++++ pw/pw.scm	Thu Apr 20 08:50:02 2000
+@@ -139,3 +139,3 @@
+ (define (new-buffer)
+-  (spawn "pw"))
++  (spawn (string-append datadir "/../../bin/pw"))
+ 
+--- plugins/plugin.scm	Mon May  3 04:26:05 1999
++++ plugins/plugin.scm	Thu Apr 20 08:51:31 2000
+@@ -16,3 +16,3 @@
+ (plugin-register "Pathetic Writer" "pw"
+-	"pw -plugin -geometry 400x300+4000+4000 %s")
++	(string-append datadir "/../../bin/pw -plugin -geometry 400x300+4000+4000 %s")
+ (plugin-register "Egon Animator" "egon"
+--- common/tools.scm	Thu Apr  6 08:53:09 2000
++++ common/tools.scm	Thu Apr 20 09:14:13 2000
+@@ -12,3 +12,3 @@
+ (if (stat (string-append datadir "/pw/pw.scm"))
+-  (add-menu-entry "Tools" "Pathetic Writer" "(spawn \"pw\")"))
++  (add-menu-entry "Tools" "Pathetic Writer" "(spawn (string-append datadir \"/../../bin/pw\"))"))
+ (if (stat (string-append datadir "/siag/siag.scm"))
diff --git a/math/siag/pkg-plist b/math/siag/pkg-plist
index 051a311419b7..2e1f841ac230 100644
--- a/math/siag/pkg-plist
+++ b/math/siag/pkg-plist
@@ -8,6 +8,11 @@ bin/runcmd
 bin/gvu
 bin/siaghelp
 share/siag/siod/siod.scm
+share/siag/common/dictionary.cs
+share/siag/common/dictionary.gl
+share/siag/common/dictionary.ru
+share/siag/common/fonts.txt
+share/siag/common/rgb.txt
 share/siag/common/bitmaps/blank.xpm
 share/siag/common/bitmaps/bold.xpm
 share/siag/common/bitmaps/borders.xpm
@@ -135,10 +140,8 @@ share/siag/common/bitmaps/kde/smaller.xpm
 share/siag/common/bitmaps/kde/stop.xpm
 share/siag/common/any2xpm
 share/siag/common/readpfa
-share/siag/common/colors.scm
 share/siag/common/common.scm
 share/siag/common/position.scm
-share/siag/common/fonts.scm
 share/siag/common/tools.scm
 share/siag/common/t1lib.config
 share/siag/common/FontDataBase