18 files changed, 100 insertions, 151 deletions

diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index c1c92c055582..76d552450ab1 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -3,27 +3,22 @@
 # Date created:		23 June 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.8 1999/01/27 08:31:50 fenner Exp $
+# $Id: Makefile,v 1.9 1999/03/15 18:30:04 nectar Exp $
 #
 
 DISTNAME=	fnlib-0.4
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	enlightenment
-#MASTER_SITES=	ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
-#		ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
-#		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
+MASTER_SITES=	ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
+		ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
+		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/graphics/fnlib/pkg-plist b/graphics/fnlib/pkg-plist
index 64d1529992ae..8a1dcef08f58 100644
--- a/graphics/fnlib/pkg-plist
+++ b/graphics/fnlib/pkg-plist
@@ -2,7 +2,6 @@ etc/fnrc
 include/Fnlib.h
 include/Fnlib_types.h
 lib/libFnlib.a
-lib/libFnlib.la
 lib/libFnlib.so
 lib/libFnlib.so.0.4
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 825936ff48f0..f5fb2f691aea 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				27 Oct 1998
 # Whom:					Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1999/03/15 05:59:15 nectar Exp $
+# $Id: Makefile,v 1.11 1999/03/15 18:30:04 nectar Exp $
 #
 
 DISTNAME=	gqview-0.6.0.src
@@ -14,15 +14,16 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		Imlib.4:${PORTSDIR}/graphics/imlib
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 ALL_TARGET=	gqview
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
-
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 pre-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 9258aa8d2b3b..449c39350ef3 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -3,7 +3,7 @@
 # Date created:        25 December 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
-# $Id: Makefile,v 1.2 1999/01/27 22:11:13 billf Exp $
+# $Id: Makefile,v 1.3 1999/04/22 07:39:07 mharo Exp $
 #
 
 DISTNAME=	qiv-1.0
@@ -15,20 +15,17 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
-BUILD_DEPENDS=	imlib-config:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_X_PREFIX=	yes
 MAN1=		qiv.1
 
 post-patch:
-
 	@ ${MV} ${WRKSRC}/qiv.1 ${WRKSRC}/qiv.1.pre_sed
 	@ ${SED} -e 's#\/usr\/bin#${PREFIX}/bin#g' \
 	${WRKSRC}/qiv.1.pre_sed > ${WRKSRC}/qiv.1
 
 do-install:
-
 	${INSTALL_PROGRAM} ${WRKSRC}/qiv ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/qiv.1 ${PREFIX}/man/man1/
 
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index fdafd0bd79ff..9225d554f466 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11th December 1998
 # Whom:                MANTANI Nobutaka <nobutaka@nobutaka.com>
 #
-# $Id: Makefile,v 1.4 1999/03/15 18:30:05 nectar Exp $
+# $Id: Makefile,v 1.5 1999/05/09 16:35:44 steve Exp $
 #
 
 DISTNAME=	Eterm-0.8.9
@@ -17,7 +17,7 @@ MASTER_SITES=	http://www.eterm.org/download/ \
 
 MAINTAINER=	nobutaka@nobutaka.com
 
-LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index ccafe5b284fe..a499180774b7 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
+# $Id: Makefile,v 1.11 1999/04/08 18:08:39 steve Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
@@ -13,11 +13,13 @@ MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 THEMES=		metal notif pixmap redmond95
 
@@ -28,7 +30,4 @@ post-patch:
 		${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc; \
 	done
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-engines/pkg-plist b/x11-themes/gtk-engines/pkg-plist
index 2d5af587e9c4..43d14f21fefb 100644
--- a/x11-themes/gtk-engines/pkg-plist
+++ b/x11-themes/gtk-engines/pkg-plist
@@ -79,23 +79,15 @@ share/themes/Pixmap/gtk/vline.png
 share/themes/Redmond95/ICON.png
 share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk/gtkrc
-share/themes/engines/libmetal.la
 share/themes/engines/libmetal.so
-share/themes/engines/libmetal.so.0
-share/themes/engines/libnotif.la
 share/themes/engines/libnotif.so
-share/themes/engines/libnotif.so.0
-share/themes/engines/libpixmap.la
 share/themes/engines/libpixmap.so
-share/themes/engines/libpixmap.so.0
-share/themes/engines/libredmond95.la
 share/themes/engines/libredmond95.so
-share/themes/engines/libredmond95.so.0
-@dirrm share/themes/Metal/gtk
-@dirrm share/themes/Metal
-@dirrm share/themes/Notif/gtk
-@dirrm share/themes/Notif
-@dirrm share/themes/Pixmap/gtk
-@dirrm share/themes/Pixmap
 @dirrm share/themes/Redmond95/gtk
 @dirrm share/themes/Redmond95
+@dirrm share/themes/Pixmap/gtk
+@dirrm share/themes/Pixmap
+@dirrm share/themes/Notif/gtk
+@dirrm share/themes/Notif
+@dirrm share/themes/Metal/gtk
+@dirrm share/themes/Metal
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index ccafe5b284fe..a499180774b7 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
+# $Id: Makefile,v 1.11 1999/04/08 18:08:39 steve Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
@@ -13,11 +13,13 @@ MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 THEMES=		metal notif pixmap redmond95
 
@@ -28,7 +30,4 @@ post-patch:
 		${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc; \
 	done
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 2d5af587e9c4..43d14f21fefb 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -79,23 +79,15 @@ share/themes/Pixmap/gtk/vline.png
 share/themes/Redmond95/ICON.png
 share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk/gtkrc
-share/themes/engines/libmetal.la
 share/themes/engines/libmetal.so
-share/themes/engines/libmetal.so.0
-share/themes/engines/libnotif.la
 share/themes/engines/libnotif.so
-share/themes/engines/libnotif.so.0
-share/themes/engines/libpixmap.la
 share/themes/engines/libpixmap.so
-share/themes/engines/libpixmap.so.0
-share/themes/engines/libredmond95.la
 share/themes/engines/libredmond95.so
-share/themes/engines/libredmond95.so.0
-@dirrm share/themes/Metal/gtk
-@dirrm share/themes/Metal
-@dirrm share/themes/Notif/gtk
-@dirrm share/themes/Notif
-@dirrm share/themes/Pixmap/gtk
-@dirrm share/themes/Pixmap
 @dirrm share/themes/Redmond95/gtk
 @dirrm share/themes/Redmond95
+@dirrm share/themes/Pixmap/gtk
+@dirrm share/themes/Pixmap
+@dirrm share/themes/Notif/gtk
+@dirrm share/themes/Notif
+@dirrm share/themes/Metal/gtk
+@dirrm share/themes/Metal
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index ccafe5b284fe..a499180774b7 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
+# $Id: Makefile,v 1.11 1999/04/08 18:08:39 steve Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
@@ -13,11 +13,13 @@ MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 THEMES=		metal notif pixmap redmond95
 
@@ -28,7 +30,4 @@ post-patch:
 		${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc; \
 	done
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-engines/pkg-plist b/x11-toolkits/gtk-engines/pkg-plist
index 2d5af587e9c4..43d14f21fefb 100644
--- a/x11-toolkits/gtk-engines/pkg-plist
+++ b/x11-toolkits/gtk-engines/pkg-plist
@@ -79,23 +79,15 @@ share/themes/Pixmap/gtk/vline.png
 share/themes/Redmond95/ICON.png
 share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk/gtkrc
-share/themes/engines/libmetal.la
 share/themes/engines/libmetal.so
-share/themes/engines/libmetal.so.0
-share/themes/engines/libnotif.la
 share/themes/engines/libnotif.so
-share/themes/engines/libnotif.so.0
-share/themes/engines/libpixmap.la
 share/themes/engines/libpixmap.so
-share/themes/engines/libpixmap.so.0
-share/themes/engines/libredmond95.la
 share/themes/engines/libredmond95.so
-share/themes/engines/libredmond95.so.0
-@dirrm share/themes/Metal/gtk
-@dirrm share/themes/Metal
-@dirrm share/themes/Notif/gtk
-@dirrm share/themes/Notif
-@dirrm share/themes/Pixmap/gtk
-@dirrm share/themes/Pixmap
 @dirrm share/themes/Redmond95/gtk
 @dirrm share/themes/Redmond95
+@dirrm share/themes/Pixmap/gtk
+@dirrm share/themes/Pixmap
+@dirrm share/themes/Notif/gtk
+@dirrm share/themes/Notif
+@dirrm share/themes/Metal/gtk
+@dirrm share/themes/Metal
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index ccafe5b284fe..a499180774b7 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				23 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.10 1999/03/27 10:35:56 vanilla Exp $
+# $Id: Makefile,v 1.11 1999/04/08 18:08:39 steve Exp $
 #
 
 DISTNAME=	gtk-engines-0.5
@@ -13,11 +13,13 @@ MASTER_SITE_SUBDIR=	sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 THEMES=		metal notif pixmap redmond95
 
@@ -28,7 +30,4 @@ post-patch:
 		${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc; \
 	done
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk-engines2/pkg-plist b/x11-toolkits/gtk-engines2/pkg-plist
index 2d5af587e9c4..43d14f21fefb 100644
--- a/x11-toolkits/gtk-engines2/pkg-plist
+++ b/x11-toolkits/gtk-engines2/pkg-plist
@@ -79,23 +79,15 @@ share/themes/Pixmap/gtk/vline.png
 share/themes/Redmond95/ICON.png
 share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk/gtkrc
-share/themes/engines/libmetal.la
 share/themes/engines/libmetal.so
-share/themes/engines/libmetal.so.0
-share/themes/engines/libnotif.la
 share/themes/engines/libnotif.so
-share/themes/engines/libnotif.so.0
-share/themes/engines/libpixmap.la
 share/themes/engines/libpixmap.so
-share/themes/engines/libpixmap.so.0
-share/themes/engines/libredmond95.la
 share/themes/engines/libredmond95.so
-share/themes/engines/libredmond95.so.0
-@dirrm share/themes/Metal/gtk
-@dirrm share/themes/Metal
-@dirrm share/themes/Notif/gtk
-@dirrm share/themes/Notif
-@dirrm share/themes/Pixmap/gtk
-@dirrm share/themes/Pixmap
 @dirrm share/themes/Redmond95/gtk
 @dirrm share/themes/Redmond95
+@dirrm share/themes/Pixmap/gtk
+@dirrm share/themes/Pixmap
+@dirrm share/themes/Notif/gtk
+@dirrm share/themes/Notif
+@dirrm share/themes/Metal/gtk
+@dirrm share/themes/Metal
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 5ac8bdd901a4..3b1f57c3f1fb 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -3,7 +3,7 @@
 # Date created:			10 June 1997
 # Whom:				Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.34 1999/03/15 18:30:06 nectar Exp $
+# $Id: Makefile,v 1.35 1999/04/16 07:45:01 taoka Exp $
 #
 
 DISTNAME=	enlightenment-0.15.5
@@ -12,13 +12,12 @@ MASTER_SITES=	ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 		http://www.rasterman.com/files/ \
 		ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/
 
-
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	esd.1:${PORTSDIR}/audio/esound \
 		Fnlib.0:${PORTSDIR}/graphics/fnlib \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		Imlib.3:${PORTSDIR}/graphics/imlib \
+		Imlib.4:${PORTSDIR}/graphics/imlib \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		ttf.3:${PORTSDIR}/print/freetype \
 		ghttp.1:${PORTSDIR}/www/libghttp
@@ -28,6 +27,6 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 5ac8bdd901a4..3b1f57c3f1fb 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:			10 June 1997
 # Whom:				Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.34 1999/03/15 18:30:06 nectar Exp $
+# $Id: Makefile,v 1.35 1999/04/16 07:45:01 taoka Exp $
 #
 
 DISTNAME=	enlightenment-0.15.5
@@ -12,13 +12,12 @@ MASTER_SITES=	ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 		http://www.rasterman.com/files/ \
 		ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/
 
-
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	esd.1:${PORTSDIR}/audio/esound \
 		Fnlib.0:${PORTSDIR}/graphics/fnlib \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		Imlib.3:${PORTSDIR}/graphics/imlib \
+		Imlib.4:${PORTSDIR}/graphics/imlib \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		ttf.3:${PORTSDIR}/print/freetype \
 		ghttp.1:${PORTSDIR}/www/libghttp
@@ -28,6 +27,6 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 5ac8bdd901a4..3b1f57c3f1fb 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -3,7 +3,7 @@
 # Date created:			10 June 1997
 # Whom:				Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.34 1999/03/15 18:30:06 nectar Exp $
+# $Id: Makefile,v 1.35 1999/04/16 07:45:01 taoka Exp $
 #
 
 DISTNAME=	enlightenment-0.15.5
@@ -12,13 +12,12 @@ MASTER_SITES=	ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 		http://www.rasterman.com/files/ \
 		ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/
 
-
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	esd.1:${PORTSDIR}/audio/esound \
 		Fnlib.0:${PORTSDIR}/graphics/fnlib \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		Imlib.3:${PORTSDIR}/graphics/imlib \
+		Imlib.4:${PORTSDIR}/graphics/imlib \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		ttf.3:${PORTSDIR}/print/freetype \
 		ghttp.1:${PORTSDIR}/www/libghttp
@@ -28,6 +27,6 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 10bb4ca812e1..4970540077f3 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -3,7 +3,7 @@
 # Date created:        24 November 1997
 # Whom:                Murray Stokely <murray@cdrom.com>
 #
-# $Id: Makefile,v 1.15 1999/02/22 10:27:41 steve Exp $
+# $Id: Makefile,v 1.16 1999/03/15 18:30:05 nectar Exp $
 #
 
 DISTNAME=	Eterm-0.8.8
@@ -17,13 +17,12 @@ MASTER_SITES=	ftp://ftp.eterm.org/pub/Eterm/ \
 
 MAINTAINER=	murray@cdrom.com
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" LOCALBASE=${LOCALBASE}
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		Eterm.1
 
@@ -32,9 +31,6 @@ pre-patch:
 	${CP} ${FILESDIR}/patch-kanji ${PATCHDIR}
 .endif
 
-post-patch:
-	@find ${WRKSRC} -name '*.orig' | xargs ${RM} -f
-
 post-install:
 	chown root.wheel ${PREFIX}/bin/Eterm
 	chmod 4755 ${PREFIX}/bin/Eterm
diff --git a/x11/eterm/pkg-plist b/x11/eterm/pkg-plist
index 4ef587ca728f..b96555434ada 100644
--- a/x11/eterm/pkg-plist
+++ b/x11/eterm/pkg-plist
@@ -1,52 +1,52 @@
-bin/Eterm
 bin/Esetroot
-lib/libmej.so.8
-lib/libmej.so
-lib/libmej.la
-lib/libmej.a
-lib/libEterm.so.8
-lib/libEterm.so
-lib/libEterm.la
+bin/Eterm
 lib/libEterm.a
-share/doc/Eterm/ReleaseNotes
-share/doc/Eterm/Eterm.help
-share/doc/Eterm/Eterm.ref
-share/doc/Eterm/Eterm.tcap
-share/doc/Eterm/Eterm.ti
-share/doc/Eterm/FAQ.html
-share/doc/Eterm/menu_cmd
+lib/libEterm.so
+lib/libEterm.so.8
+lib/libmej.a
+lib/libmej.so
+lib/libmej.so.8
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/Eterm/colortest.sh
 share/Eterm/pix/014.png
 share/Eterm/pix/backwave.jpg
 share/Eterm/pix/button1.jpg
 share/Eterm/pix/button5.jpg
 share/Eterm/pix/circuit.png
-share/Eterm/pix/nebula.jpg
 share/Eterm/pix/fourthday.jpg
 share/Eterm/pix/gaia.jpg
 share/Eterm/pix/galleon.jpg
+share/Eterm/pix/nebula.jpg
 share/Eterm/pix/night_of_the_dragon.jpg
 share/Eterm/pix/pixmaps.list
-share/Eterm/colortest.sh
-share/Eterm/themes/Eterm/MAIN
 share/Eterm/themes/Eterm/Eterm.menu
+share/Eterm/themes/Eterm/MAIN
 share/Eterm/themes/Eterm/pixmaps.list
-share/Eterm/themes/chooser/chooser.menu
 share/Eterm/themes/chooser/MAIN
+share/Eterm/themes/chooser/chooser.menu
 share/Eterm/themes/chooser/pixmaps.list
-share/Eterm/themes/emacs/emacs.menu
 share/Eterm/themes/emacs/MAIN
+share/Eterm/themes/emacs/emacs.menu
 share/Eterm/themes/emacs/pixmaps.list
-share/Eterm/themes/irc/irc.menu
 share/Eterm/themes/irc/MAIN
+share/Eterm/themes/irc/irc.menu
 share/Eterm/themes/irc/pixmaps.list
-share/Eterm/themes/mutt/mutt.menu
 share/Eterm/themes/mutt/MAIN
+share/Eterm/themes/mutt/mutt.menu
 share/Eterm/themes/mutt/pixmaps.list
 share/Eterm/themes/tn3270/MAIN
 share/Eterm/themes/tn3270/pixmaps.list
-share/Eterm/themes/trans/trans.menu
 share/Eterm/themes/trans/MAIN
 share/Eterm/themes/trans/pixmaps.list
+share/Eterm/themes/trans/trans.menu
+share/doc/Eterm/Eterm.help
+share/doc/Eterm/Eterm.ref
+share/doc/Eterm/Eterm.tcap
+share/doc/Eterm/Eterm.ti
+share/doc/Eterm/FAQ.html
+share/doc/Eterm/ReleaseNotes
+share/doc/Eterm/menu_cmd
 @dirrm share/doc/Eterm
 @dirrm share/Eterm/themes/Eterm
 @dirrm share/Eterm/themes/chooser