Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

6 files changed, 5 insertions, 58 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 7450c371967..5526e7854f3 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:54 fredb Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 21:52:35 jlam Exp $
 
 DISTNAME=		Eterm-0.8.10
 PKGNAME=		eterm-0.8.10
@@ -18,7 +18,7 @@ ETERM_SRCS=		${DISTNAME}${EXTRACT_SUFX}
 PIXMAP_FILES=		Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
 			Eterm-bg-tile.tar.gz
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -41,6 +41,5 @@ post-install:
 	${CHMOD} 4711 ${PREFIX}/bin/Eterm
 .endif
 
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/imlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index fd2e930bf23..1ea848c340d 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/06/17 22:13:43 agc Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:52:36 jlam Exp $
 
 SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d
 Size (Eterm-0.8.10.tar.gz) = 593026 bytes
@@ -12,7 +12,4 @@ SHA1 (patch-aa) = 056585ad4c39b60a3dbf41d8c7e65d31ba5f7fcd
 SHA1 (patch-ab) = cdea7fe7a3c546e9f89a7eb86ec079f34572e984
 SHA1 (patch-ac) = 26b0f5c13f2b621db1c5edf84c5123b315225d8d
 SHA1 (patch-ad) = a750146fe3a0b0b2796997cf2e20e38f14be86bf
-SHA1 (patch-ae) = 7464d0b7b4b8d5b4c825d7fdcfa464b5e3d18a6c
-SHA1 (patch-af) = 8f21b197a56ddc0d66f29dcf9d5dcbe7922a28ae
-SHA1 (patch-ag) = 5359f122eb6fe605202288de59d71d07be4d2556
 SHA1 (patch-ah) = ebf2fa3ae2d272795f0a292b201586cc2158c973
diff --git a/x11/eterm/patches/patch-ae b/x11/eterm/patches/patch-ae
deleted file mode 100644
index 792bb622c18..00000000000
--- a/x11/eterm/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2001/08/29 22:41:28 jlam Exp $
-
---- libmej/Makefile.in.orig	Fri Nov  5 11:03:53 1999
-+++ libmej/Makefile.in
-@@ -105,7 +105,7 @@
- 
- libmej_la_SOURCES = debug.c mem.c strings.c snprintf.c
- 
--INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
-+INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. $(X_CFLAGS)
- 
- libmej_la_LDFLAGS = -release $(VERSION)
- 
diff --git a/x11/eterm/patches/patch-af b/x11/eterm/patches/patch-af
deleted file mode 100644
index 782a96609b5..00000000000
--- a/x11/eterm/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/08/29 22:41:28 jlam Exp $
-
---- src/Makefile.in.orig	Fri Nov  5 14:03:54 1999
-+++ src/Makefile.in
-@@ -113,8 +113,8 @@
- Eterm_DEPENDENCIES = libEterm.la
- Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) libEterm.la
- 
--INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
--LDADD = $(DIST_ROOT)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
-+INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. $(X_CFLAGS)
-+LDADD = $(DIST_ROOT)/libmej/libmej.la $(LIBS) $(GRLIBS) $(X_LIBS)
- 
- EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h              eterm_imlib.h eterm_utmp.h feature.h.in graphics.h grkelot.h grx.h main.h              menubar.h misc.h options.h pixmap.h profile.h screen.h scrollbar.h              system.h threads.h graphics/Makefile.am graphics/Makefile.in              graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h              graphics/qplot.c Eterm.xpm
- 
diff --git a/x11/eterm/patches/patch-ag b/x11/eterm/patches/patch-ag
deleted file mode 100644
index 0a5e32b2a7b..00000000000
--- a/x11/eterm/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/08/29 22:41:28 jlam Exp $
-
---- utils/Makefile.in.orig	Fri Nov  5 14:03:55 1999
-+++ utils/Makefile.in
-@@ -101,14 +101,14 @@
- THREADLIBS = @THREADLIBS@
- VERSION = @VERSION@
- 
--INCLUDES = -I. -I../libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
-+INCLUDES = -I. -I../libmej -I.. $(X_CFLAGS)
- 
- bin_PROGRAMS = Esetroot Etbg
- bin_SCRIPTS = Etcolors.sh Etmenu.sh
- 
- Esetroot_SOURCES = Esetroot.c
- Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--Esetroot_LDADD = -L$(DIST_ROOT)/libmej -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
-+Esetroot_LDADD = -L$(DIST_ROOT)/libmej $(LIBS) $(GRLIBS) $(X_LIBS)
- 
- Etbg_SOURCES = Etbg.c
- 
diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah
index 75e18862915..9e55f00b586 100644
--- a/x11/eterm/patches/patch-ah
+++ b/x11/eterm/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/06/17 22:13:45 agc Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 21:52:39 jlam Exp $
 
 --- src/utmp.c	2002/06/17 21:59:32	1.1
 +++ src/utmp.c	2002/06/17 22:03:43