Add full DESTDIR support.

4 files changed, 15 insertions, 13 deletions

diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index 6ba2d52a44e..6a0fc8e94cd 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/01/18 05:06:23 tnn Exp $
+# $NetBSD: Makefile,v 1.41 2008/03/05 15:01:06 jlam Exp $
 
 DISTNAME=	ekg-1.7
 PKGREVISION=	1
@@ -10,6 +10,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://ekg.chmurka.net/
 COMMENT=	Experimental Gadu-Gadu Client (Polish instant messaging system)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
diff --git a/chat/ekg/distinfo b/chat/ekg/distinfo
index b2631497567..0641b754c29 100644
--- a/chat/ekg/distinfo
+++ b/chat/ekg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2007/10/14 07:48:52 adam Exp $
+$NetBSD: distinfo,v 1.21 2008/03/05 15:01:06 jlam Exp $
 
 SHA1 (ekg-1.7.tar.gz) = 3b02d2e9fff440783a202f343bda62dc6ad24815
 RMD160 (ekg-1.7.tar.gz) = 1832b34e5d8081fd8b04c85cd87be8cc07908b05
 Size (ekg-1.7.tar.gz) = 530314 bytes
-SHA1 (patch-aa) = 9a5fba8121c3ff6bff6d5971f1d99aa442441cfc
+SHA1 (patch-aa) = 8da65a969af2eac2dfcfee1d34e4581094c71adc
 SHA1 (patch-ab) = 26323cd967c5358e3e5bbab5ab61b9d8d0ee7f1e
-SHA1 (patch-ac) = 67420ae770893ed429d90a3b0bf496fef6fd97b5
+SHA1 (patch-ac) = f9c0acdda1665bed11b1c5d0d47b2c708d122eac
 SHA1 (patch-ad) = 228df5c7890dfbb863956cb258f994b08e168c04
diff --git a/chat/ekg/patches/patch-aa b/chat/ekg/patches/patch-aa
index 934b2128577..27bc1be01d1 100644
--- a/chat/ekg/patches/patch-aa
+++ b/chat/ekg/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2007/10/14 07:48:52 adam Exp $
+$NetBSD: patch-aa,v 1.9 2008/03/05 15:01:06 jlam Exp $
 
---- src/Makefile.in.orig	2007-04-28 22:02:22.000000000 +0200
+--- src/Makefile.in.orig	2007-04-28 16:02:22.000000000 -0400
 +++ src/Makefile.in
 @@ -26,9 +26,9 @@ SRCS = $(OBJS:.o=.c) comptime.c
  
@@ -14,15 +14,15 @@ $NetBSD: patch-aa,v 1.8 2007/10/14 07:48:52 adam Exp $
  
  ioctld:	ioctld.c
  	$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
-@@ -42,9 +42,8 @@ dep:	.depend
+@@ -42,9 +42,9 @@ dep:	.depend
  
  install: all install-ekg @install_ioctld@
  
 -install-ekg:	@strip_ekg@
--	$(INSTALL) -d $(DESTDIR)$(bindir)
--	$(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
 +install-ekg:
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ekg ${PREFIX}/bin
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)
+-	$(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ekg $(DESTDIR)$(bindir)
  
  install-ioctld:	@strip_ioctld@
  	$(INSTALL) -d $(DESTDIR)$(libexecdir)
diff --git a/chat/ekg/patches/patch-ac b/chat/ekg/patches/patch-ac
index 1109d45f3f5..6b36f1d9c59 100644
--- a/chat/ekg/patches/patch-ac
+++ b/chat/ekg/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2007/10/14 07:48:52 adam Exp $
+$NetBSD: patch-ac,v 1.6 2008/03/05 15:01:06 jlam Exp $
 
 --- lib/Makefile.in.orig	2006-04-18 21:05:11.000000000 +0200
 +++ lib/Makefile.in
@@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.5 2007/10/14 07:48:52 adam Exp $
  $(STATIC): $(OBJS)
 -	$(AR) r $(STATIC) $(OBJS) 
 -	$(RANLIB) $(STATIC)
-+	${LIBTOOL} --mode=link ${CC} -o ${STATIC:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${VERSION_MAJOR}:${VERSION_MINOR}
++	${LIBTOOL} --mode=link ${CC} -o ${STATIC:.a=.la} ${OBJS:.o=.lo} -rpath $(libdir) -version-info ${VERSION_MAJOR}:${VERSION_MINOR}
  
  #
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.5 2007/10/14 07:48:52 adam Exp $
  
  install-static:	install-common
 -	$(INSTALL) -m 755 $(STATIC) $(DESTDIR)$(libdir)
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${STATIC:.a=.la} ${PREFIX}/lib
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${STATIC:.a=.la} $(DESTDIR)$(libdir)
  
  strip-libgadu-so:
  	$(STRIP) $(SHARED)