[pkgsrc/trunk]: pkgsrc/converters DESTDIR support. Use modular Xorg for wv.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77450c7b5613
branches:  trunk
changeset: 521555:77450c7b5613
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Nov 14 13:55:34 2006 +0000

description:
DESTDIR support. Use modular Xorg for wv.

XXX Remove pre-install in libiconv?

diffstat:

 converters/fribidi/Makefile          |   4 +++-
 converters/libiconv/Makefile         |   7 ++++---
 converters/libiconv/distinfo         |   4 ++--
 converters/libiconv/patches/patch-ae |  27 ++++++++++++++++++---------
 converters/wv/Makefile               |   6 ++++--
 5 files changed, 31 insertions(+), 17 deletions(-)

diffs (138 lines):

diff -r 6cef9cf4534c -r 77450c7b5613 converters/fribidi/Makefile
--- a/converters/fribidi/Makefile       Tue Nov 14 13:53:27 2006 +0000
+++ b/converters/fribidi/Makefile       Tue Nov 14 13:55:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 20:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/11/14 13:55:34 joerg Exp $
 #
 
 DISTNAME=              fribidi-0.10.4
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://fribidi.org/
 COMMENT=               Free Implementation of the Unicode Bidirectional Algorithm
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 REPLACE_INTERPRETER+=  bash
 REPLACE.bash.old=      /bin/bash
 REPLACE.bash.new=      ${SH}
diff -r 6cef9cf4534c -r 77450c7b5613 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Tue Nov 14 13:53:27 2006 +0000
+++ b/converters/libiconv/Makefile      Tue Nov 14 13:55:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/06/08 03:56:21 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/11/14 13:55:34 joerg Exp $
 
 DISTNAME=      libiconv-1.10
 PKGREVISION=   3
@@ -14,6 +14,7 @@
 PATCH_DIST_STRIP=      -p1
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
@@ -42,11 +43,11 @@
 # charset.alias files, which were not removed during deinstall since
 # other packages touched them.
 pre-install:
-       ${RM} -f ${PREFIX}/lib/charset.alias
+       ${RM} -f ${DESTDIR}${PREFIX}/lib/charset.alias
 
 # be sure to install a new charset.alias
 post-install:
-       cd ${WRKSRC}/libcharset/lib && ${MAKE} libdir=${EGDIR} \
+       cd ${WRKSRC}/libcharset/lib && ${MAKE} libdir=${EGDIR} DESTDIR=${DESTDIR:Q} \
                install-charset-alias
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6cef9cf4534c -r 77450c7b5613 converters/libiconv/distinfo
--- a/converters/libiconv/distinfo      Tue Nov 14 13:53:27 2006 +0000
+++ b/converters/libiconv/distinfo      Tue Nov 14 13:55:34 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2005/10/02 06:09:47 taca Exp $
+$NetBSD: distinfo,v 1.24 2006/11/14 13:55:34 joerg Exp $
 
 SHA1 (libiconv-1.10.tar.gz) = a0190b476e322775d91ee0eabe4041e3a591f865
 RMD160 (libiconv-1.10.tar.gz) = 33c648775743331adf8dcfbc994179fd2fda6aad
@@ -10,5 +10,5 @@
 SHA1 (patch-ab) = 26ada1bf2dbb99a56713331f0830ccef9250fc7a
 SHA1 (patch-ac) = 2858dc88a214af794b6358863b1aed24a129d41d
 SHA1 (patch-ad) = 1e21a1ad8a81141990a2c7982af8576c68c819db
-SHA1 (patch-ae) = 626c959de9d4b5276ddf774f6aa68d20bff32184
+SHA1 (patch-ae) = 28f18b89762ee81d63d2e3f0b7937bc3eba23567
 SHA1 (patch-af) = ee6ce5cf4f2fd0a5606bb23296964f34ca2e165c
diff -r 6cef9cf4534c -r 77450c7b5613 converters/libiconv/patches/patch-ae
--- a/converters/libiconv/patches/patch-ae      Tue Nov 14 13:53:27 2006 +0000
+++ b/converters/libiconv/patches/patch-ae      Tue Nov 14 13:55:34 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2004/04/28 15:19:04 tv Exp $
+$NetBSD: patch-ae,v 1.5 2006/11/14 13:55:34 joerg Exp $
 
---- libcharset/lib/Makefile.in.orig    Mon Apr 14 09:51:06 2003
+--- libcharset/lib/Makefile.in.orig    2005-03-22 17:30:59.000000000 +0100
 +++ libcharset/lib/Makefile.in
 @@ -9,7 +9,7 @@ srcdir = @srcdir@
  prefix = @prefix@
@@ -11,19 +11,28 @@
  
  # Programs used by "make":
  CC = @CC@
-@@ -77,8 +77,10 @@ ref-del.sed : $(srcdir)/ref-del.sin
+@@ -77,13 +77,13 @@ ref-del.sed : $(srcdir)/ref-del.sin
  # Installs the library and include files only. Typically called with only
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
+-      $(mkinstalldirs) $(libdir)
+-      $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
+-      test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
+-                                      || orig=charset.alias; \
+-      sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
+-      $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
+-      rm -f $(libdir)/t-charset.alias
 +
 +install-charset-alias : all force
-       $(mkinstalldirs) $(libdir)
--      $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
++      $(mkinstalldirs) $(DESTDIR)$(libdir)
 +#     $(LIBTOOL_INSTALL) $(INSTALL) libcharset.la $(libdir)/libcharset.la
-       test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
-                                       || orig=charset.alias; \
-       sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-@@ -94,7 +96,9 @@ install-lib : all force
++      orig=charset.alias; \
++      sed -f ref-add.sed $$orig > t-charset.alias; \
++      $(INSTALL_DATA) t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
+ 
+ # The following is needed in order to install a simple file in $(libdir)
+ # which is shared with other installed packages. We use a list of referencing
+@@ -94,7 +94,9 @@ install-lib : all force
  
  install : all force
        $(mkinstalldirs) $(DESTDIR)$(libdir)
diff -r 6cef9cf4534c -r 77450c7b5613 converters/wv/Makefile
--- a/converters/wv/Makefile    Tue Nov 14 13:53:27 2006 +0000
+++ b/converters/wv/Makefile    Tue Nov 14 13:55:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/10/31 20:06:08 adam Exp $
+# $NetBSD: Makefile,v 1.59 2006/11/14 13:55:34 joerg Exp $
 
 DISTNAME=      wv-1.2.4
 CATEGORIES=    converters
@@ -8,6 +8,8 @@
 HOMEPAGE=      http://wvware.sourceforge.net/
 COMMENT=       Library and executables to access Microsoft Word files
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config
@@ -28,5 +30,5 @@
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"