* Libtoolize graphics/OpenRM so that we correctly build shared libraries

  on all platforms supported by libtool.

* Remove the unnecessary dependencies on glut and perl, and only use
  perl as a build dependency.

* Use REPLACE_PERL instead of hand-crafted substitution code.

Bump the PKGREVISION for graphics/OpenRM to 2.  Due to the changed
dependency graph, bump the PKGREVISION for packages that use the OpenRM
libraries.  In this case, games/genecys-client is the only one, so
bump its PKGREVISION to 2.

14 files changed, 200 insertions, 92 deletions

diff --git a/graphics/OpenRM/Makefile b/graphics/OpenRM/Makefile
index 03915e2841a..23370849750 100644
--- a/graphics/OpenRM/Makefile
+++ b/graphics/OpenRM/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:57 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/23 04:02:48 jlam Exp $
 #
 
 DISTNAME=		openrm-devel-1.5.2
 PKGNAME=		OpenRM-1.5.2
-PKGREVISION=	1
+PKGREVISION=		2
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openrm/}
 
@@ -12,51 +12,39 @@ HOMEPAGE=		http://www.openrm.org/
 COMMENT=		The OpenRM Scene Graph API
 
 WRKSRC=			${WRKDIR}/rm152
-BUILD_TARGET=		freebsd docs
-MAKE_ENV+=		AR=${AR} RM=${RM} CP=${CP} LN=${LN} ECHO_CMD=${ECHO} \
-			STRIP_CMD=${ECHO}
+CFLAGS+=		-I${X11BASE}/include
+BUILD_TARGET=		libtool docs
+USE_LIBTOOL=		yes
+USE_TOOLS+=		perl
+REPLACE_PERL=		doc/sortlist.pl doc/source2html.pl
 
+DOCDIR=			${PREFIX}/share/doc/OpenRM
 INSTALLATION_DIRS=	lib
 
-post-patch:
-	${MV} ${WRKSRC}/doc/sortlist.pl ${WRKSRC}/doc/sortlist.pl.orig && \
-		${SED} -e 's|%%PERLBIN%%|${PERL5}|g'			  \
-		${WRKSRC}/doc/sortlist.pl.orig > ${WRKSRC}/doc/sortlist.pl
-	${CHMOD} 755 ${WRKSRC}/doc/sortlist.pl
-	${MV} ${WRKSRC}/doc/source2html.pl ${WRKSRC}/doc/source2html.pl.orig &&\
-		${SED} -e 's|%%PERLBIN%%|${PERL5}|g'			  \
-		${WRKSRC}/doc/source2html.pl.orig > ${WRKSRC}/doc/source2html.pl
-	${CHMOD} 755 ${WRKSRC}/doc/source2html.pl
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+
+do-configure:
+	${CHMOD} +x ${WRKSRC}/bin/mklib.libtool
 
 do-install:
-# install libraries
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/librm.so.1 ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/librmaux.so.1 ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/librmi.so.1 ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/librmv.so.1 ${PREFIX}/lib
-	${LN} -fs ${PREFIX}/lib/librm.so.1 ${PREFIX}/lib/librm.so
-	${LN} -fs ${PREFIX}/lib/librmaux.so.1 ${PREFIX}/lib/librmaux.so
-	${LN} -fs ${PREFIX}/lib/librmi.so.1 ${PREFIX}/lib/librmi.so
-	${LN} -fs ${PREFIX}/lib/librmv.so.1 ${PREFIX}/lib/librmv.so
-	${INSTALL_DATA} ${WRKSRC}/lib/librm.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/librmaux.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/librmi.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/librmv.a ${PREFIX}/lib
-# install includes
+	# install libraries
+	for name in rm rmaux rmi rmv; do				\
+		${LIBTOOL} --mode=install ${INSTALL_LIB}		\
+			${WRKSRC}/$$name/lib$$name.la ${PREFIX}/lib;	\
+	done
+	# install includes
 	${INSTALL_DATA_DIR} ${PREFIX}/include/rm
 	${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${PREFIX}/include/rm
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/OpenRM
-	${INSTALL_DATA} ${WRKSRC}/FUTUREPLANS ${PREFIX}/share/doc/OpenRM
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/OpenRM
-	${INSTALL_DATA} ${WRKSRC}/RELEASENOTES ${PREFIX}/share/doc/OpenRM
-	${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${PREFIX}/share/doc/OpenRM
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/OpenRM/images
-	${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${PREFIX}/share/doc/OpenRM/images
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/FUTUREPLANS ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASENOTES ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${DOCDIR}/images
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/OpenRM/PLIST b/graphics/OpenRM/PLIST
index 68b58ae45b0..693d55923b1 100644
--- a/graphics/OpenRM/PLIST
+++ b/graphics/OpenRM/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/05 20:34:17 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/06/23 04:02:48 jlam Exp $
 include/rm/rm.h
 include/rm/rmaux.h
 include/rm/rmcmpmgr.h
@@ -19,18 +19,10 @@ include/rm/rmvpub.h
 include/rm/rmw.h
 include/rm/rmx.h
 @dirrm include/rm
-lib/librm.a
-lib/librm.so
-lib/librm.so.1
-lib/librmaux.a
-lib/librmaux.so
-lib/librmaux.so.1
-lib/librmi.a
-lib/librmi.so
-lib/librmi.so.1
-lib/librmv.a
-lib/librmv.so
-lib/librmv.so.1
+lib/librm.la
+lib/librmaux.la
+lib/librmi.la
+lib/librmv.la
 share/doc/OpenRM/FUTUREPLANS
 share/doc/OpenRM/README
 share/doc/OpenRM/RELEASENOTES
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 3e9595cab40..53b2b191d80 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/06/23 04:02:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENRM_BUILDLINK3_MK:=	${OPENRM_BUILDLINK3_MK}+
@@ -15,9 +15,10 @@ BUILDLINK_DEPENDS.OpenRM+=	OpenRM>=1.5.1
 BUILDLINK_PKGSRCDIR.OpenRM?=	../../graphics/OpenRM
 .endif	# OPENRM_BUILDLINK3_MK
 
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/OpenRM/distinfo b/graphics/OpenRM/distinfo
index 2f02798a5cf..eda87f0d912 100644
--- a/graphics/OpenRM/distinfo
+++ b/graphics/OpenRM/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.6 2005/06/07 16:21:41 garbled Exp $
+$NetBSD: distinfo,v 1.7 2005/06/23 04:02:48 jlam Exp $
 
 SHA1 (openrm-devel-1.5.2.tar.gz) = 8d68099b779ea0e45361f7270ade0646e2d1e635
 RMD160 (openrm-devel-1.5.2.tar.gz) = 3e0d3492b017aea2abdd3cbea0a3edd92d302023
 Size (openrm-devel-1.5.2.tar.gz) = 633707 bytes
 SHA1 (patch-aa) = 45caa6f9d0117e98f707ba7c7e071e1f9dae4d1f
-SHA1 (patch-ab) = c8ad68eb88b9ff557d15f1c3e358dbee828c5605
-SHA1 (patch-ac) = 1288d0d5fa8de3484859f75b9b94554a5ebd1643
-SHA1 (patch-ad) = 94c69540e804cc5550cd62fd4f125a3fa14a1ba9
 SHA1 (patch-ae) = 4ed639a1d2a91c9b2105308af5ac9a811d7e1596
+SHA1 (patch-af) = 3e979fe0b9dc2e0c9f51bb91e069710779c013ed
+SHA1 (patch-ag) = 1044b260c8ecbff1cd5dccad65d5431281068b68
+SHA1 (patch-ah) = c616302761f2663a7da9f56eee45d79dff1a431d
+SHA1 (patch-ai) = 3aeee96ee0e73f0b51e1f770f22b225bb435b58e
+SHA1 (patch-aj) = 06ba3b183ba15935108bfb60bb098a71f10cc27c
+SHA1 (patch-ak) = 52f05039fb635deed9dced10ec964392d9c02851
+SHA1 (patch-al) = 562d2f68fc16ddc9756f3e18332b2b78a3ee9029
diff --git a/graphics/OpenRM/patches/patch-ab b/graphics/OpenRM/patches/patch-ab
deleted file mode 100644
index 88453b6e9bb..00000000000
--- a/graphics/OpenRM/patches/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/05 20:34:17 garbled Exp $
---- doc/sortlist.pl.orig	Mon Feb  2 12:08:19 2004
-+++ doc/sortlist.pl	Mon Feb  2 12:08:35 2004
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!%%PERLBIN%%
- 
- #
- # Copyright (C) 2000-2004, R3vis Corporation, All Rights Reserved.
diff --git a/graphics/OpenRM/patches/patch-ac b/graphics/OpenRM/patches/patch-ac
deleted file mode 100644
index a7470c28904..00000000000
--- a/graphics/OpenRM/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/02/05 20:34:17 garbled Exp $
---- doc/source2html.pl.orig	Mon Feb  2 12:08:22 2004
-+++ doc/source2html.pl	Mon Feb  2 12:08:46 2004
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!%%PERLBIN%%
- 
- #
- # Copyright (C) 2000-2004, R3vis Corporation, All Rights Reserved.
diff --git a/graphics/OpenRM/patches/patch-ad b/graphics/OpenRM/patches/patch-ad
deleted file mode 100644
index ab1d86aeb2c..00000000000
--- a/graphics/OpenRM/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/02/10 23:58:36 jlam Exp $
-
---- bin/mklib.freebsd.orig	Thu Dec 11 16:24:35 2003
-+++ bin/mklib.freebsd
-@@ -47,7 +47,7 @@ ${RM} -f ${LIBRARY}.a ${LIBRARY}.so.${VE
- ${AR} qv ${LIBRARY}.a ${OBJECTS}
- 
- # FreeBSD specific build
--${CC} -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS} ${DEPLIBS}
-+${CC} -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS} ${LDFLAGS} ${DEPLIBS}
- if [ ${ARCHFLAGS##*-} != "debug" ]; then
-     ${STRIP_CMD} ${LIBRARY}.so.${VERSION}
-     ${ECHO_CMD} "library has been stripped (non-debug build)."
diff --git a/graphics/OpenRM/patches/patch-af b/graphics/OpenRM/patches/patch-af
new file mode 100644
index 00000000000..e59a9279b69
--- /dev/null
+++ b/graphics/OpenRM/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+--- Makefile.orig	2004-04-18 13:03:27.000000000 -0400
++++ Makefile
+@@ -104,6 +104,7 @@ default:
+ 	@echo "  irix6-n32-mips4-debug"
+ 	@echo "  irix6-64"
+ 	@echo "  irix6-64-debug"
++	@echo "  libtool"
+ 	@echo "  linux"
+ 	@echo "  linux-debug"
+ 	@echo "  linux-cr-debug"
+@@ -131,6 +132,7 @@ irix6-n32-mips4 \
+ irix6-n32-mips4-debug \
+ irix6-64 \
+ irix6-64-debug \
++libtool \
+ linux \
+ linux-debug \
+ linux-cr-debug \
diff --git a/graphics/OpenRM/patches/patch-ag b/graphics/OpenRM/patches/patch-ag
new file mode 100644
index 00000000000..44e2638fa06
--- /dev/null
+++ b/graphics/OpenRM/patches/patch-ag
@@ -0,0 +1,25 @@
+$NetBSD: patch-ag,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+--- make.cfg.orig	2004-04-18 15:55:13.000000000 -0400
++++ make.cfg
+@@ -144,6 +144,20 @@ freebsd:
+ 	"MAKELIB = ../bin/mklib.freebsd" \
+ 	"ARCHFLAGS = none"
+ 
++libtool:
++	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
++	"CC = libtool --mode=compile cc" \
++	"XINC = -I/usr/X11R6/include" \
++	"RMINC = ../include" \
++	"CFLAGS = $(CFLAGS) -c -DRM_X" \
++	"RMLIB = librm" \
++	"RMVLIB = librmv" \
++	"RMAUXLIB = librmaux" \
++	"RMILIB = librmi" \
++	"LIBDIR = ../lib" \
++	"MAKELIB = ../bin/mklib.libtool" \
++	"ARCHFLAGS = none"
++
+ linux:
+ 	@$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
+ 	"CC = gcc" \
diff --git a/graphics/OpenRM/patches/patch-ah b/graphics/OpenRM/patches/patch-ah
new file mode 100644
index 00000000000..6900b226364
--- /dev/null
+++ b/graphics/OpenRM/patches/patch-ah
@@ -0,0 +1,57 @@
+$NetBSD: patch-ah,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+--- /dev/null	2005-06-22 02:24:06.000000000 -0400
++++ bin/mklib.libtool	2005-06-22 02:23:35.000000000 -0400
+@@ -0,0 +1,52 @@
++#!/bin/sh
++
++# Make a libtool archive
++
++# $Id: patch-ah,v 1.1 2005/06/23 04:02:48 jlam Exp $
++
++#--common--------------------------------------------------------------
++
++# Usage:  mklib <archflags> <libname> <major> <minor> <file.o ... >
++#
++# <archflags> are arcitecture specific build flags
++# <libname> is name of output library (LIBRARY)
++# <major> is major version number (MAJOR)
++# <minor> is minor version number (MINOR)
++# <file.o ... > remaining arguments are object files (OBJECTS)
++# 
++# added local installation target prefix (RM_INSTALL)
++# tidied up the build
++#
++# 06/22/05 Contributor: jlam at NetBSD dot org
++#
++
++ARCHFLAGS=$1
++shift 1
++
++LIBRARY=$1
++shift 1
++
++MAJOR=$1
++shift 1
++
++MINOR=$1
++shift 1
++
++VERSION=$MAJOR.$MINOR
++
++OBJECTS=
++for obj in "$@"; do
++	lobj=`basename $obj .o`.lo
++	OBJECTS="${OBJECTS} $lobj"
++done
++
++DEPLIBS="-lGL -lGLU -L${X11BASE}/lib -lX11 -lXmu"
++
++#--platform------------------------------------------------------------
++
++# build library objects
++echo "Building libtool archive $LIBRARY.la"
++libtool --mode=clean rm -f ${LIBRARY}.la
++
++# libtool specific build
++libtool --mode=link cc ${LDFLAGS} -o ${LIBRARY}.la ${OBJECTS} ${DEPLIBS} -rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}
diff --git a/graphics/OpenRM/patches/patch-ai b/graphics/OpenRM/patches/patch-ai
new file mode 100644
index 00000000000..58455e905f7
--- /dev/null
+++ b/graphics/OpenRM/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+--- rm/Makefile.x11.orig	2004-01-16 11:42:38.000000000 -0500
++++ rm/Makefile.x11
+@@ -98,7 +98,7 @@ $(LIBDIR)/$(RMLIB): $(OBJECTS)
+ 	@if ([ -d $(LIBDIR) ]) then :; else (mkdir $(LIBDIR)); fi
+ 	@if (\rm -f $(LIBDIR)/$(RMLIB)) then :; fi
+ 	@$(MAKELIB) $(ARCHFLAGS) $(RMLIB) $(MAJOR) $(MINOR) $(OBJECTS)
+-	@mv $(RMLIB)* $(LIBDIR)
++	@cp $(RMLIB)* $(LIBDIR)
+ 
+ dep:
+ 	@makedepend -Y -I../include -I/$(GLINC) *.c -f depend
diff --git a/graphics/OpenRM/patches/patch-aj b/graphics/OpenRM/patches/patch-aj
new file mode 100644
index 00000000000..640b19b36e2
--- /dev/null
+++ b/graphics/OpenRM/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+--- rmaux/Makefile.x11.orig	2004-01-16 23:07:53.000000000 -0500
++++ rmaux/Makefile.x11
+@@ -105,7 +105,7 @@ $(LIBDIR)/$(RMAUXLIB): $(OBJECTS)
+ 	@if ([ -d $(LIBDIR) ]) then :; else (mkdir $(LIBDIR)); fi
+ 	@if (\rm -f $(LIBDIR)/$(RMAUXLIB)) then :; fi
+ 	@$(MAKELIB)  $(ARCHFLAGS) $(RMAUXLIB) $(MAJOR) $(MINOR) $(OBJECTS)
+-	@mv $(RMAUXLIB)* $(LIBDIR)
++	@cp $(RMAUXLIB)* $(LIBDIR)
+ 
+ dep:
+ 	makedepend  -Y -I../include *.c -f depend
diff --git a/graphics/OpenRM/patches/patch-ak b/graphics/OpenRM/patches/patch-ak
new file mode 100644
index 00000000000..926b8ced152
--- /dev/null
+++ b/graphics/OpenRM/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+--- rmi/Makefile.x11.orig	2004-01-16 23:09:05.000000000 -0500
++++ rmi/Makefile.x11
+@@ -80,7 +80,7 @@ $(LIBDIR)/$(RMILIB): $(OBJECTS)
+ 	@if ([ -d $(LIBDIR) ]) then :; else (mkdir $(LIBDIR)); fi
+ 	@if (\rm -f $(LIBDIR)/$(RMILIB)) then :; fi
+ 	@$(MAKELIB)  $(ARCHFLAGS) $(RMILIB) $(MAJOR) $(MINOR) $(OBJECTS)
+-	@mv $(RMILIB)* $(LIBDIR)
++	@cp $(RMILIB)* $(LIBDIR)
+ 
+ dep:
+ 	makedepend -Y -I../include *.c -f depend
diff --git a/graphics/OpenRM/patches/patch-al b/graphics/OpenRM/patches/patch-al
new file mode 100644
index 00000000000..08fe46f693f
--- /dev/null
+++ b/graphics/OpenRM/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+--- rmv/Makefile.x11.orig	2004-01-16 23:09:26.000000000 -0500
++++ rmv/Makefile.x11
+@@ -98,7 +98,7 @@ $(LIBDIR)/$(RMVLIB): $(OBJECTS)
+ 	@if ([ -d $(LIBDIR) ]) then :; else (mkdir $(LIBDIR)); fi
+ 	@if (\rm -f $(LIBDIR)/$(RMVLIB)) then :; fi
+ 	@$(MAKELIB)  $(ARCHFLAGS) $(RMVLIB) $(MAJOR) $(MINOR) $(OBJECTS)
+-	@mv $(RMVLIB)* $(LIBDIR)
++	@cp $(RMVLIB)* $(LIBDIR)
+ 
+ dep:
+ 	makedepend -Y -I../include *.c -f depend