head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.54
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.52
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.50
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.48
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.46
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.44
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.42
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.40
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.38
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.36
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.34
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.32
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.30
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.28
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.26
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.24
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.22
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.20
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.18
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.16
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.14
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.12
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.10
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.8
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.6
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6:1.1.0.8
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.0.4
	pkgviews-base:1.1
	buildlink2:1.1.0.2
	buildlink2-base:1.1
	netbsd-1-5-PATCH003:1.1;
locks; strict;
comment	@# @;


1.2
date	2002.08.25.21.52.38;	author jlam;	state dead;
branches;
next	1.1;

1.1
date	2001.08.29.22.41.28;	author jlam;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2002.06.30.06.24.41;	author jlam;	state dead;
branches;
next	;


desc
@@


1.2
log
@Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
@
text
@$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
 
@


1.1
log
@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.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@Convert to use the buildlink2 framework.  Trim any unnecessary changes in
the patches or remove them entirely.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.1 2001/08/29 22:41:28 jlam Exp $
@