[pkgsrc/trunk]: pkgsrc Convert to user-destdir.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9ad9a4722b2
branches:  trunk
changeset: 554566:f9ad9a4722b2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Feb 16 12:04:01 2009 +0000

description:
Convert to user-destdir.

diffstat:

 wm/openbox/Makefile         |   4 +++-
 wm/openbox/distinfo         |   4 ++--
 wm/openbox/patches/patch-aa |  14 +++++++-------
 www/surfraw/Makefile        |  14 +++++++-------
 4 files changed, 19 insertions(+), 17 deletions(-)

diffs (114 lines):

diff -r ca6387d94f0d -r f9ad9a4722b2 wm/openbox/Makefile
--- a/wm/openbox/Makefile       Mon Feb 16 11:54:09 2009 +0000
+++ b/wm/openbox/Makefile       Mon Feb 16 12:04:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/09/16 17:47:57 jakllsch Exp $
+# $NetBSD: Makefile,v 1.52 2009/02/16 12:04:01 wiz Exp $
 
 DISTNAME=      openbox-3.4.7.2
 PKGREVISION=   1
@@ -13,6 +13,8 @@
 
 DEPENDS+=              vera-ttf>=1.10:../../fonts/vera-ttf
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         YES
 USE_DIRS+=             gnome2-1.5 xdg-1.4
 USE_TOOLS+=            gmake msgfmt pkg-config
diff -r ca6387d94f0d -r f9ad9a4722b2 wm/openbox/distinfo
--- a/wm/openbox/distinfo       Mon Feb 16 11:54:09 2009 +0000
+++ b/wm/openbox/distinfo       Mon Feb 16 12:04:01 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2008/11/24 21:35:16 tnn Exp $
+$NetBSD: distinfo,v 1.20 2009/02/16 12:04:01 wiz Exp $
 
 SHA1 (openbox-3.4.7.2.tar.gz) = f34c3ec43b7e39bf57d64dbef97c35b68fea5254
 RMD160 (openbox-3.4.7.2.tar.gz) = a5ab5f4c3db81625d512da48189e34aeeec244d8
 Size (openbox-3.4.7.2.tar.gz) = 828190 bytes
-SHA1 (patch-aa) = 77043ec9f0466dbd2eb5dd54e467f983afccd9c1
+SHA1 (patch-aa) = 343f54e1aa60dd9e0e69cb6e6a53c80dc8d071df
 SHA1 (patch-ab) = bb13ec5801c2e271f1e6b2dc4d0aa149c9e2dff1
 SHA1 (patch-ac) = cd5d329332623b97435fd72cf2be1b52049c041f
diff -r ca6387d94f0d -r f9ad9a4722b2 wm/openbox/patches/patch-aa
--- a/wm/openbox/patches/patch-aa       Mon Feb 16 11:54:09 2009 +0000
+++ b/wm/openbox/patches/patch-aa       Mon Feb 16 12:04:01 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/06/08 13:32:00 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2009/02/16 12:04:01 wiz Exp $
 
---- Makefile.in.orig   2007-06-05 16:06:37.000000000 +0000
+--- Makefile.in.orig   2008-04-23 15:18:43.000000000 +0000
 +++ Makefile.in
-@@ -409,7 +409,7 @@ target_alias = @target_alias@
+@@ -471,7 +471,7 @@ target_alias = @target_alias@
  SUBDIRS = m4 po
  docxbmdir = $(docdir)/xbm
  themedir = $(datadir)/themes
@@ -11,19 +11,19 @@
  rcdir = $(configdir)/openbox
  xsessionsdir = $(datadir)/xsessions
  gnomewmfilesdir = $(datadir)/gnome/wm-properties
-@@ -2118,12 +2118,12 @@ uninstall-dist_pixmapDATA:
+@@ -3101,12 +3101,12 @@ uninstall-dist_pixmapDATA:
        done
  install-dist_rcDATA: $(dist_rc_DATA)
        @$(NORMAL_INSTALL)
 -      test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
-+      $(mkinstalldirs) $(datadir)/examples/openbox
++      $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
        @list='$(dist_rc_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f=$(am__strip_dir) \
 -        echo " $(dist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
 -        $(dist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
-+        echo " $(dist_rcDATA_INSTALL) '$$d$$p' '$(datadir)/examples/openbox/$$f'"; \
-+        $(dist_rcDATA_INSTALL) "$$d$$p" "$(datadir)/examples/openbox/$$f"; \
++        echo " $(dist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/openbox/$$f'"; \
++        $(dist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/openbox/$$f"; \
        done
  
  uninstall-dist_rcDATA:
diff -r ca6387d94f0d -r f9ad9a4722b2 www/surfraw/Makefile
--- a/www/surfraw/Makefile      Mon Feb 16 11:54:09 2009 +0000
+++ b/www/surfraw/Makefile      Mon Feb 16 12:04:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/10/09 09:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2009/02/16 12:06:35 wiz Exp $
 #
 
 DISTNAME=      surfraw-2.2.3
@@ -11,6 +11,8 @@
 
 CONFLICTS+=    surfaw-[0-9]*
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --disable-sr
@@ -21,6 +23,7 @@
 DOCDIR=                        ${PREFIX}/share/doc/surfraw
 EGDIR=                 ${PREFIX}/share/examples/surfraw
 INSTALLATION_DIRS=     ${DOCDIR}
+INSTALL_MAKE_FLAGS=    sysconfdir=${EGDIR}
 
 CONF_FILES=            ${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
 CONF_FILES+=           ${EGDIR}/surfraw.bookmarks ${PKG_SYSCONFDIR}/surfraw.bookmarks
@@ -34,13 +37,10 @@
        ${SED} -e s/sr/surfraw/g ${WRKSRC}/elvi.1sr.IN > ${WRKSRC}/elvi.1sr.IN.new
        ${MV} ${WRKSRC}/elvi.1sr.IN.new ${WRKSRC}/elvi.1sr.IN
 
-# Override installation to install config files in example dir
-do-install:
-       cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_ARGS} sysconfdir=${EGDIR} install
-
 # fix man page name; install additional documentation
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-       ${MV} ${PREFIX}/${PKGMANDIR}/man1/elvi.1sr ${PREFIX}/${PKGMANDIR}/man1/elvi.1
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+       ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/elvi.1sr \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/elvi.1
 
 .include "../../mk/bsd.pkg.mk"