Convert to user-destdir.

4 files changed, 19 insertions, 17 deletions

diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 3b36965957c..20f5b3cbe08 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -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 @@ COMMENT=	Standards compliant, light-weight and extensible window manager
 
 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 --git a/wm/openbox/distinfo b/wm/openbox/distinfo
index 2d55bc1410e..78339d2d48f 100644
--- a/wm/openbox/distinfo
+++ b/wm/openbox/distinfo
@@ -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 --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa
index 5e4802b6928..6d372f11733 100644
--- a/wm/openbox/patches/patch-aa
+++ b/wm/openbox/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.6 2007/06/08 13:32:00 wiz Exp $
  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 --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 2487608003b..94213d2fe7b 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -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 @@ COMMENT=	Shell Users' Revolutionary Front Rage Against the Web
 
 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 @@ REPLACE_PERL+=		surfraw-update-path.IN opensearch-discover \
 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 @@ post-patch:
 	${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"