Conversion to a single libtool environment.

Approved by:	portmgr (kris)

7 files changed, 21 insertions, 99 deletions

diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 9a73b994d39c..13bcdffb32e1 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	1.2.10
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/glib/1.2
@@ -16,10 +16,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Some useful routines of C programming (previous stable version)
 
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -34,5 +33,9 @@ post-patch:
 
 post-install:
 	${LN} -sf ${PREFIX}/bin/glib-config ${PREFIX}/bin/glib12-config
+.for lib in glib gmodule gthread
+	@${RM} ${PREFIX}/lib/lib${lib}.la ${PREFIX}/lib/lib${lib}.so
+	@${MV} ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/lib${lib}-12.a
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/glib12/files/patch-ac b/devel/glib12/files/patch-ac
index b1b572394465..8ced7ad51c72 100644
--- a/devel/glib12/files/patch-ac
+++ b/devel/glib12/files/patch-ac
@@ -12,16 +12,16 @@
  	libsa=""
  	if test "$lib_glib" = "yes"; then
 -		libsp="$libsp -lglib"
-+		libsp="$libsp -lglib@LT_RELEASE@"
++		libsp="$libsp -lglib-@LT_RELEASE@"
  	fi
  	if test "$lib_gthread" = "yes"; then
 -		libsp="-lgthread $libsp"
-+		libsp="-lgthread@LT_RELEASE@ $libsp"
++		libsp="-lgthread-@LT_RELEASE@ $libsp"
  		libsa="$libsa @G_THREAD_LIBS@"
  	fi
  	if test "$lib_gmodule" = "yes"; then
 -		libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
-+		libsp="@G_MODULE_LDFLAGS@ -lgmodule@LT_RELEASE@ $libsp"
++		libsp="@G_MODULE_LDFLAGS@ -lgmodule-@LT_RELEASE@ $libsp"
  		libsa="$libsa @G_MODULE_LIBS@"
  	fi
  	echo -L@libdir@ $libsp $libsa
diff --git a/devel/glib12/files/patch-ad b/devel/glib12/files/patch-ad
deleted file mode 100644
index fc31caba3c31..000000000000
--- a/devel/glib12/files/patch-ad
+++ /dev/null
@@ -1,81 +0,0 @@
---- configure.in.orig	Tue May 11 04:31:37 1999
-+++ configure.in	Mon May 17 22:29:31 1999
-@@ -48,10 +48,10 @@
- AC_SUBST(GLIB_BINARY_AGE)
- 
- # libtool versioning
--LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
--LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE`
--LT_REVISION=$GLIB_INTERFACE_AGE
--LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE`
-+LT_RELEASE=12
-+LT_CURRENT=3
-+LT_REVISION=0
-+LT_AGE=0
- AC_SUBST(LT_RELEASE)
- AC_SUBST(LT_CURRENT)
- AC_SUBST(LT_REVISION)
-@@ -273,7 +273,7 @@
- AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
- 
- # Check for some functions
--AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
-+AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp)
- 
- # Check for sys_errlist
- AC_MSG_CHECKING(for sys_errlist)
-@@ -528,6 +528,12 @@
- 	  linux*)
- 	    G_MODULE_LDFLAGS='-rdynamic'
- 	    ;;
-+	  freebsd*)
-+	    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+	    if test $objformat = "elf"; then
-+		    G_MODULE_LDFLAGS='-Wl,-E'
-+	    fi
-+	    ;;
- 	esac
- 	LIBS_orig="$LIBS"
- 	LDFLAGS_orig="$LDFLAGS"
-@@ -737,11 +743,17 @@
-             	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
- 		fi
- 		;;
--	*-freebsd2.2*)
--		G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
--
--		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
--		# -mthreads flag.
-+	*-*-freebsd*)
-+		if test x"$G_THREAD_LIBS" = x"-lc_r"; then
-+			G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+			G_THREAD_LIBS="${PTHREAD_LIBS}"
-+			case $host in
-+			*-*-freebsd4*) ;;
-+			default) have_poll=no ;;
-+			esac
-+		else
-+			G_THREAD_CFLAGS="${PTHREAD_CFLAGS} -DLINUXTHREADS"
-+		fi
- 		;;
-     esac
- 
-@@ -858,8 +867,6 @@
- AC_SUBST(G_THREAD_CFLAGS)
- AC_SUBST(G_THREAD_LIBS)
- 
--CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
--
- dnl **********************************************
- dnl *** GDefaultMutex setup and initialization ***
- dnl **********************************************
-@@ -883,6 +890,9 @@
- dnl ****************************************
- dnl *** GLib POLL* compatibility defines ***
- dnl ****************************************
-+if test x"$have_poll" != xno; then
-+	AC_CHECK_FUNCS(poll)
-+fi
- GLIB_SYSDEFS(
- [#include <sys/types.h>
- #include <sys/poll.h>],
diff --git a/devel/glib12/files/patch-glib.pc.in b/devel/glib12/files/patch-glib.pc.in
index 2685712572de..0e38edab69c5 100644
--- a/devel/glib12/files/patch-glib.pc.in
+++ b/devel/glib12/files/patch-glib.pc.in
@@ -6,6 +6,6 @@
  Version: @VERSION@
 -Libs: -L${libdir} -lglib
 -Cflags: -I${includedir}/glib-1.2 -I${libdir}/glib/include 
-+Libs: -L${libdir} -lglib12
++Libs: -L${libdir} -lglib-12
 +Cflags: -I${includedir}
  
diff --git a/devel/glib12/files/patch-gmodule.pc.in b/devel/glib12/files/patch-gmodule.pc.in
index 9b262d9ced56..f9816891293c 100644
--- a/devel/glib12/files/patch-gmodule.pc.in
+++ b/devel/glib12/files/patch-gmodule.pc.in
@@ -5,5 +5,5 @@
  Requires: glib
  Version: @VERSION@
 -Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule @G_MODULE_LIBS@
-+Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule12 @G_MODULE_LIBS@
++Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-12 @G_MODULE_LIBS@
  Cflags:
diff --git a/devel/glib12/files/patch-gthread.pc.in b/devel/glib12/files/patch-gthread.pc.in
index 175af0bd62ba..4086046cc5c2 100644
--- a/devel/glib12/files/patch-gthread.pc.in
+++ b/devel/glib12/files/patch-gthread.pc.in
@@ -5,5 +5,5 @@
  Requires: glib
  Version: @VERSION@
 -Libs: -L${libdir} -lgthread @G_THREAD_LIBS@
-+Libs: -L${libdir} -lgthread12 @G_THREAD_LIBS@
++Libs: -L${libdir} -lgthread-12 @G_THREAD_LIBS@
  Cflags: @G_THREAD_CFLAGS@
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index b597f9f41f66..ca6c55996987 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -3,15 +3,15 @@ bin/glib12-config
 include/glib12/glib.h
 include/glib12/glibconfig.h
 include/glib12/gmodule.h
-lib/libglib12.a
-lib/libglib12.so
-lib/libglib12.so.3
-lib/libgmodule12.a
-lib/libgmodule12.so
-lib/libgmodule12.so.3
-lib/libgthread12.a
-lib/libgthread12.so
-lib/libgthread12.so.3
+lib/libglib-12.a
+lib/libglib-12.so
+lib/libglib-12.so.3
+lib/libgmodule-12.a
+lib/libgmodule-12.so
+lib/libgmodule-12.so.3
+lib/libgthread-12.a
+lib/libgthread-12.so
+lib/libgthread-12.so.3
 libdata/pkgconfig/glib.pc
 libdata/pkgconfig/gmodule.pc
 libdata/pkgconfig/gthread.pc