From d29b1f77f942277123d6b9eafb788c6f0553ab5c Mon Sep 17 00:00:00 2001
From: hira <hira>
Date: Thu, 28 Dec 2006 11:10:08 +0000
Subject: Pass -R${X11BASE}/lib to extra scrollbars.  Bump PKGREVISION.

---
 x11/mlterm/Makefile         |  3 ++-
 x11/mlterm/distinfo         |  3 ++-
 x11/mlterm/patches/patch-ap | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 x11/mlterm/patches/patch-ap

(limited to 'x11')

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 026cda0ebd2..2695b3a55d7 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2006/12/19 07:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/12/28 11:10:08 hira Exp $
 
 DISTNAME=	mlterm-2.9.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 85a1eca2091..49ae841ae23 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2006/12/19 07:53:57 wiz Exp $
+$NetBSD: distinfo,v 1.18 2006/12/28 11:10:08 hira Exp $
 
 SHA1 (mlterm-2.9.3.tar.gz) = 65ba5a7bd83accf7f621f84b84debb35c8f215ef
 RMD160 (mlterm-2.9.3.tar.gz) = 27f4381a8b8b68b07e53bbeb422581beb7527b48
@@ -15,3 +15,4 @@ SHA1 (patch-al) = 6b87b81e403a3fac9794c666c1e0260a3d5b5bd4
 SHA1 (patch-am) = 83684bfa15e5596abddef92cf994bb92b9f21990
 SHA1 (patch-an) = 156b8ebf5c7fdf68c39df7076849a05a90eb7e5a
 SHA1 (patch-ao) = 680ac866197202e09c25d93b20a7e3b700f38370
+SHA1 (patch-ap) = 3cfe668a591623d45043621813a68d8958cb81c7
diff --git a/x11/mlterm/patches/patch-ap b/x11/mlterm/patches/patch-ap
new file mode 100644
index 00000000000..e3d6839df40
--- /dev/null
+++ b/x11/mlterm/patches/patch-ap
@@ -0,0 +1,35 @@
+$NetBSD: patch-ap,v 1.1 2006/12/28 11:10:08 hira Exp $
+
+--- contrib/scrollbar/extra/Makefile.in.orig	2006-12-28 15:23:38.000000000 +0900
++++ contrib/scrollbar/extra/Makefile.in	2006-12-28 15:39:29.000000000 +0900
+@@ -29,26 +29,22 @@
+ 
+ all: athena motif mozmodern next
+ athena: $(ATHENA_OBJ)
+-	$(LIBTOOL_LINK) -o libathena.la $(ATHENA_OBJ:.o=.lo) \
+-	-rpath $(libdir)/mlterm \
++	$(LIBTOOL_LINK) -o libathena.la $(ATHENA_OBJ:.o=.lo) -rpath $(LIBDIR) \
+ 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
+ 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+ 
+ motif: $(MOTIF_OBJ)
+-	$(LIBTOOL_LINK) -o libmotif.la $(MOTIF_OBJ:.o=.lo) \
+-	-rpath $(libdir)/mlterm \
++	$(LIBTOOL_LINK) -o libmotif.la $(MOTIF_OBJ:.o=.lo) -rpath $(LIBDIR) \
+ 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
+ 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+ 
+ mozmodern: $(MOZMODERN_OBJ)
+-	$(LIBTOOL_LINK) -o libmozmodern.la $(MOZMODERN_OBJ:.o=.lo) \
+-	-rpath $(libdir)/mlterm \
++	$(LIBTOOL_LINK) -o libmozmodern.la $(MOZMODERN_OBJ:.o=.lo) -rpath $(LIBDIR) \
+ 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
+ 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+ 
+ next: $(NEXT_OBJ)
+-	$(LIBTOOL_LINK) -o libnext.la $(NEXT_OBJ:.o=.lo) \
+-	-rpath $(libdir)/mlterm \
++	$(LIBTOOL_LINK) -o libnext.la $(NEXT_OBJ:.o=.lo) -rpath $(LIBDIR) \
+ 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
+ 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+ 
-- 
cgit v1.2.3