Use glib version 1.2.3.

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

8 files changed, 30 insertions, 29 deletions

diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 198d2fc79fc1..94081abb1ba3 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			22 Oct 1998
 # Whom:				Seiichirou Hiraoka
 #
-# $Id: Makefile,v 1.2 1999/03/31 11:38:02 flathill Exp $
+# $Id: Makefile,v 1.3 1999/05/08 00:24:18 taoka Exp $
 #
 
 DISTNAME=	libicq-0.33
@@ -18,10 +18,12 @@ PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	flathill@FreeBSD.ORG
 
-LIB_DEPENDS=    glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=    glib12.2:${PORTSDIR}/devel/glib12
+
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 GNU_CONFIGURE=  yes
-CONFIGURE_ENV=  GLIB_CONFIG="${PREFIX}/bin/glib12-config"
+CONFIGURE_ENV=  GLIB_CONFIG="${GLIB_CONFIG}"
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index c85b7d0b6bc3..27d04cc55656 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -3,7 +3,7 @@
 # Date created:					Sun May  4 21:40:06 CDT 1997
 # Whom:						jmacd
 #
-# $Id: Makefile,v 1.12 1999/02/20 10:47:28 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/05/02 18:48:03 mharo Exp $
 #
 
 DISTNAME=	xdelta-1.0.2
@@ -13,20 +13,15 @@ MASTER_SITES=	ftp://ftp.xcf.berkeley.edu/pub/xdelta/
 MAINTAINER=	jmacd@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12
 
-GNU_CONFIGURE=	yes
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS=-L${LOCALBASE}/lib \
-		INSTALL_SCRIPT='$${INSTALL} -m 755' \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
+		GLIB_CONFIG="${GLIB_CONFIG}"
 
 MAN1=           xdelta.1
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
-
 .include <bsd.port.mk>
diff --git a/misc/xdelta/pkg-plist b/misc/xdelta/pkg-plist
index 729602fa2542..76aedcac5fdc 100644
--- a/misc/xdelta/pkg-plist
+++ b/misc/xdelta/pkg-plist
@@ -5,12 +5,11 @@ include/xdelta.h
 include/xdser.h
 @unexec install-info --delete %D/info/xdelta.info %D/info/dir
 info/xdelta.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/xdelta.info %D/info/dir
 lib/libxdelta.a
-lib/libxdelta.la
 lib/libxdelta.so
 lib/libxdelta.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/xdelta.m4
+@unexec rmdir %D/share/aclocal 2>/dev/null || true
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 80b261d7bf73..8bd7f4644977 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				31 Oct 1998
 # Whom:					Seiichirou Hiraoka
 #
-# $Id: Makefile,v 1.3 1999/03/15 19:59:22 nectar Exp $
+# $Id: Makefile,v 1.4 1999/05/08 00:24:25 taoka Exp $
 #
 
 DISTNAME=	libicq-0.33
@@ -13,9 +13,11 @@ MASTER_SITES=	ftp://ftp.korsoft.com/pub/gicq/                        \
 
 MAINTAINER=	flathill@FreeBSD.ORG
 
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GLIB_CONFIG="${PREFIX}/bin/glib12-config"
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net-im/libicq/pkg-plist b/net-im/libicq/pkg-plist
index 75b1ff7e562e..c717b5fc0c3c 100644
--- a/net-im/libicq/pkg-plist
+++ b/net-im/libicq/pkg-plist
@@ -1,6 +1,5 @@
 include/libicq.h
 lib/libicq.a
-lib/libicq.la
 lib/libicq.so
 lib/libicq.so.0.3
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 80b261d7bf73..8bd7f4644977 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				31 Oct 1998
 # Whom:					Seiichirou Hiraoka
 #
-# $Id: Makefile,v 1.3 1999/03/15 19:59:22 nectar Exp $
+# $Id: Makefile,v 1.4 1999/05/08 00:24:25 taoka Exp $
 #
 
 DISTNAME=	libicq-0.33
@@ -13,9 +13,11 @@ MASTER_SITES=	ftp://ftp.korsoft.com/pub/gicq/                        \
 
 MAINTAINER=	flathill@FreeBSD.ORG
 
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GLIB_CONFIG="${PREFIX}/bin/glib12-config"
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/libicq/pkg-plist b/net/libicq/pkg-plist
index 75b1ff7e562e..c717b5fc0c3c 100644
--- a/net/libicq/pkg-plist
+++ b/net/libicq/pkg-plist
@@ -1,6 +1,5 @@
 include/libicq.h
 lib/libicq.a
-lib/libicq.la
 lib/libicq.so
 lib/libicq.so.0.3
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
diff --git a/net/xferstats/Makefile b/net/xferstats/Makefile
index 396349791cab..1ecefd446da3 100644
--- a/net/xferstats/Makefile
+++ b/net/xferstats/Makefile
@@ -3,7 +3,7 @@
 # Date created:         19 February 1999
 # Whom:                 Dima Sivachenko
 #
-# $Id: Makefile,v 1.2 1999/03/02 01:53:46 steve Exp $
+# $Id: Makefile,v 1.3 1999/03/08 16:57:45 foxfair Exp $
 #
 
 DISTNAME=	xferstats-2.14
@@ -14,14 +14,17 @@ MASTER_SITES=	http://xferstats.off.net/download/xferstats-2.00/ \
 
 MAINTAINER=	dima@Chg.RU
 
-LIB_DEPENDS=	glib11.0:${PORTSDIR}/devel/glib11
+LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12
+
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 WRKSRC=		${WRKDIR}/xferstats
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
+
 MAN8=		xferstats.8
 
 do-install:
-
 		@ ${INSTALL_PROGRAM} ${WRKSRC}/xferstats ${PREFIX}/bin
 		@ ${INSTALL_MAN} ${WRKSRC}/xferstats.8 ${MAN8PREFIX}/man/man8
 		@ ${INSTALL_DATA} ${WRKSRC}/xferstats.cfg ${PREFIX}/etc/xferstats.cfg.sample