Set USE_LIBTOOL=yes and use new version of gtk.

PR:		11844
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

6 files changed, 34 insertions, 58 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 52fde42048f2..2f8aaa2f230a 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.17 1999/04/16 05:48:40 taoka Exp $
+# $Id: Makefile,v 1.18 1999/05/06 07:17:31 asami Exp $
 #
 
 DISTNAME=	ORBit-0.4.3
@@ -13,20 +13,14 @@ MASTER_SITE_SUBDIR=	sources/ORBit
 
 MAINTAINER=	clkao@CirX.ORG
 
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libIDL/configure popt/configure
+CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 CONFIGURE_ARGS= --disable-indent
 
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index a4ebc3344f61..b1a23552dde6 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -5,7 +5,7 @@
  BUILT_SOURCES = $(libwrap_files)
  
 -libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libIIOP_la_LDFLAGS = -version-info 1:0:0
++libIIOP_la_LDFLAGS = -version-info 2:0:0
  
  EXTRA_DIST = IIOP-design.txt
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -16,7 +16,7 @@
  
  
 -libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBitutil_la_LDFLAGS = -version-info 1:0:0
++libORBitutil_la_LDFLAGS = -version-info 2:0:0
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
  CONFIG_CLEAN_FILES = 
@@ -27,7 +27,7 @@
  IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
  
 -libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBit_la_LDFLAGS = -version-info 1:0:0
++libORBit_la_LDFLAGS = -version-info 2:0:0
  libORBit_la_LIBADD = $(GLIB_LIBS) -lm
  
  BUILT_SOURCES =  	interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
@@ -38,7 +38,7 @@
  
  
 -libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBitCosNaming_la_LDFLAGS =  	-version-info 1:0:0
++libORBitCosNaming_la_LDFLAGS =  	-version-info 2:0:0
  
  
  INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src  @GLIB_CFLAGS@
@@ -58,7 +58,7 @@
  libIDL_la_SOURCES = parser.c parser.h lexer.c 			  ns.c util.c util.h rename.h
  
 -libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
-+libIDL_la_LDFLAGS = -version-info 1:0:0
++libIDL_la_LDFLAGS = -version-info 2:0:0
  
  
  m4datadir = $(datadir)/aclocal
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index f1424dd5e314..8dc038a4576b 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -67,28 +67,22 @@ include/orb/sequences.h
 include/orb/typecode.h
 @unexec install-info --delete %D/info/libIDL.info %D/info/dir
 info/libIDL.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/libIDL.info %D/info/dir
 lib/libIDL.a
-lib/libIDL.la
 lib/libIDL.so
-lib/libIDL.so.1
+lib/libIDL.so.2
 lib/libIIOP.a
-lib/libIIOP.la
 lib/libIIOP.so
-lib/libIIOP.so.1
+lib/libIIOP.so.2
 lib/libORBit.a
-lib/libORBit.la
 lib/libORBit.so
-lib/libORBit.so.1
+lib/libORBit.so.2
 lib/libORBitCosNaming.a
-lib/libORBitCosNaming.la
 lib/libORBitCosNaming.so
-lib/libORBitCosNaming.so.1
+lib/libORBitCosNaming.so.2
 lib/libORBitutil.a
-lib/libORBitutil.la
 lib/libORBitutil.so
-lib/libORBitutil.so.1
+lib/libORBitutil.so.2
 lib/libname-server.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 52fde42048f2..2f8aaa2f230a 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.17 1999/04/16 05:48:40 taoka Exp $
+# $Id: Makefile,v 1.18 1999/05/06 07:17:31 asami Exp $
 #
 
 DISTNAME=	ORBit-0.4.3
@@ -13,20 +13,14 @@ MASTER_SITE_SUBDIR=	sources/ORBit
 
 MAINTAINER=	clkao@CirX.ORG
 
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libIDL/configure popt/configure
+CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 CONFIGURE_ARGS= --disable-indent
 
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac
index a4ebc3344f61..b1a23552dde6 100644
--- a/devel/ORBit2/files/patch-ac
+++ b/devel/ORBit2/files/patch-ac
@@ -5,7 +5,7 @@
  BUILT_SOURCES = $(libwrap_files)
  
 -libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libIIOP_la_LDFLAGS = -version-info 1:0:0
++libIIOP_la_LDFLAGS = -version-info 2:0:0
  
  EXTRA_DIST = IIOP-design.txt
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -16,7 +16,7 @@
  
  
 -libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBitutil_la_LDFLAGS = -version-info 1:0:0
++libORBitutil_la_LDFLAGS = -version-info 2:0:0
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
  CONFIG_CLEAN_FILES = 
@@ -27,7 +27,7 @@
  IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
  
 -libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBit_la_LDFLAGS = -version-info 1:0:0
++libORBit_la_LDFLAGS = -version-info 2:0:0
  libORBit_la_LIBADD = $(GLIB_LIBS) -lm
  
  BUILT_SOURCES =  	interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
@@ -38,7 +38,7 @@
  
  
 -libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBitCosNaming_la_LDFLAGS =  	-version-info 1:0:0
++libORBitCosNaming_la_LDFLAGS =  	-version-info 2:0:0
  
  
  INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src  @GLIB_CFLAGS@
@@ -58,7 +58,7 @@
  libIDL_la_SOURCES = parser.c parser.h lexer.c 			  ns.c util.c util.h rename.h
  
 -libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
-+libIDL_la_LDFLAGS = -version-info 1:0:0
++libIDL_la_LDFLAGS = -version-info 2:0:0
  
  
  m4datadir = $(datadir)/aclocal
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index f1424dd5e314..8dc038a4576b 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -67,28 +67,22 @@ include/orb/sequences.h
 include/orb/typecode.h
 @unexec install-info --delete %D/info/libIDL.info %D/info/dir
 info/libIDL.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/libIDL.info %D/info/dir
 lib/libIDL.a
-lib/libIDL.la
 lib/libIDL.so
-lib/libIDL.so.1
+lib/libIDL.so.2
 lib/libIIOP.a
-lib/libIIOP.la
 lib/libIIOP.so
-lib/libIIOP.so.1
+lib/libIIOP.so.2
 lib/libORBit.a
-lib/libORBit.la
 lib/libORBit.so
-lib/libORBit.so.1
+lib/libORBit.so.2
 lib/libORBitCosNaming.a
-lib/libORBitCosNaming.la
 lib/libORBitCosNaming.so
-lib/libORBitCosNaming.so.1
+lib/libORBitCosNaming.so.2
 lib/libORBitutil.a
-lib/libORBitutil.la
 lib/libORBitutil.so
-lib/libORBitutil.so.1
+lib/libORBitutil.so.2
 lib/libname-server.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B