From e9740a7b1d46b8e07e0d0a242db87cc579c667d6 Mon Sep 17 00:00:00 2001
From: ijliao <ijliao@FreeBSD.org>
Date: Wed, 23 Oct 2002 08:38:28 +0000
Subject: upgrade to 2.2.0

PR:		44120
Submitted by:	Ports Fury
---
 x11-toolkits/movingmotif/Makefile                      |  5 +++--
 x11-toolkits/movingmotif/distinfo                      |  2 +-
 x11-toolkits/movingmotif/files/patch-configure         | 10 ++++++++++
 x11-toolkits/movingmotif/files/patch-demo::Makefile.in | 18 ++++++++++++++++++
 x11-toolkits/movingmotif/pkg-plist                     |  5 +++--
 5 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 x11-toolkits/movingmotif/files/patch-configure
 create mode 100644 x11-toolkits/movingmotif/files/patch-demo::Makefile.in

diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index 78279f511d90..d364be8463aa 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -6,15 +6,16 @@
 # $FreeBSD$
 
 PORTNAME=	movingmotif
-PORTVERSION=	2.1.0
+PORTVERSION=	2.2.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_LIBTOOL=	yes
 USE_MOTIF=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/movingmotif/distinfo b/x11-toolkits/movingmotif/distinfo
index 2649a6d652a5..5cafe6ee6ae6 100644
--- a/x11-toolkits/movingmotif/distinfo
+++ b/x11-toolkits/movingmotif/distinfo
@@ -1 +1 @@
-MD5 (movingmotif-2.1.0.tar.gz) = 2cd9194c69fe9bbcef40ec19e60cee42
+MD5 (movingmotif-2.2.0.tar.gz) = c27bf61d5ea444b5564a4268665ca896
diff --git a/x11-toolkits/movingmotif/files/patch-configure b/x11-toolkits/movingmotif/files/patch-configure
new file mode 100644
index 000000000000..ef926c8a75c5
--- /dev/null
+++ b/x11-toolkits/movingmotif/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Jun 29 15:58:05 2002
++++ configure	Sat Oct 12 15:11:36 2002
+@@ -6518,6 +6518,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/movingmotif/files/patch-demo::Makefile.in b/x11-toolkits/movingmotif/files/patch-demo::Makefile.in
new file mode 100644
index 000000000000..7282e838d2a3
--- /dev/null
+++ b/x11-toolkits/movingmotif/files/patch-demo::Makefile.in
@@ -0,0 +1,18 @@
+--- demo/Makefile.in.orig	Wed Sep 25 01:04:47 2002
++++ demo/Makefile.in	Sat Oct 12 15:10:51 2002
+@@ -114,12 +114,12 @@
+ bin_PROGRAMS = ezdrawtest Scrollingtest histbar Rottest
+ 
+ ezdrawtest_SOURCES = ezdrawtest.c
+-ezdrawtest_LDADD = -L$(top_builddir)/src -lmovingmotif 			-L$(top_builddir)/demo/mindsrc -lmindsrc
++ezdrawtest_LDADD = $(top_builddir)/src/libmovingmotif.la 			$(top_builddir)/demo/mindsrc/libmindsrc.la
+ 
+-LIBS = $(MOTIF_LIBS) $(X_LIBS) -lXm -lXpm -lXt -lX11 -lc -lm
++LIBS = $(MOTIF_LIBS) $(X_LIBS) -lXm -lXpm -lXt -lX11 -lm
+ INCLUDES = $(MOTIF_CFLAGS) $(X_CFLAGS) 			-I$(top_srcdir)/demo/mindsrc -I$(top_srcdir)/src
+ 
+-LDADD = -L$(top_builddir)/src -lmovingmotif 			-L$(top_builddir)/demo/mindsrc -lmindsrc
++LDADD = $(top_builddir)/src/libmovingmotif.la 			$(top_builddir)/demo/mindsrc/libmindsrc.la
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
diff --git a/x11-toolkits/movingmotif/pkg-plist b/x11-toolkits/movingmotif/pkg-plist
index cef5cd0f42dd..222971185252 100644
--- a/x11-toolkits/movingmotif/pkg-plist
+++ b/x11-toolkits/movingmotif/pkg-plist
@@ -1,9 +1,10 @@
 bin/Scrollingtest
+bin/Rottest
 bin/ezdrawtest
 bin/histbar
-lib/libmindsrc.la
+lib/libmindsrc.a
 lib/libmindsrc.so
 lib/libmindsrc.so.0
-lib/libmovingmotif.la
+lib/libmovingmotif.a
 lib/libmovingmotif.so
 lib/libmovingmotif.so.0
-- 
cgit