From b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 29 Aug 2001 22:41:00 +0000
Subject: Use x11.buildlink.mk instead of USE_X11.  Also convert hard-coded
 references to ${X11BASE} in the header and library search paths into
 references to ${LOCALBASE}/share/x11-links.  These packages should now be
 strongly- buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
---
 x11/eterm/Makefile         |  3 ++-
 x11/eterm/distinfo         |  5 ++++-
 x11/eterm/patches/patch-ae | 13 +++++++++++++
 x11/eterm/patches/patch-af | 15 +++++++++++++++
 x11/eterm/patches/patch-ag | 21 +++++++++++++++++++++
 5 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 x11/eterm/patches/patch-ae
 create mode 100644 x11/eterm/patches/patch-af
 create mode 100644 x11/eterm/patches/patch-ag

(limited to 'x11/eterm')

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 4cefb7d825e..144869e24e8 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/26 13:40:43 zuntum Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/29 22:41:27 jlam Exp $
 
 DISTNAME=		Eterm-0.8.10
 PKGNAME=		eterm-0.8.10
@@ -42,4 +42,5 @@ post-install:
 .endif
 
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 74e57f86c1d..161d5ac02e4 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/28 11:07:34 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $
 
 SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d
 Size (Eterm-0.8.10.tar.gz) = 593026 bytes
@@ -12,3 +12,6 @@ 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
diff --git a/x11/eterm/patches/patch-ae b/x11/eterm/patches/patch-ae
new file mode 100644
index 00000000000..792bb622c18
--- /dev/null
+++ b/x11/eterm/patches/patch-ae
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..782a96609b5
--- /dev/null
+++ b/x11/eterm/patches/patch-af
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..0a5e32b2a7b
--- /dev/null
+++ b/x11/eterm/patches/patch-ag
@@ -0,0 +1,21 @@
+$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
+ 
-- 
cgit v1.2.3