+ Add full DESTDIR support in the least intrusive way possible. The

  strategy is to leave alone the install targets sprinkled all over
  the Makefiles and instead to two thigns:

    (1) Define new INST_* variants of BINDIR, ETCDIR, MODULEDIR, etc.
	that are the "final" installation locations, and thus may be
	hardcoded into the program.

    (2) Modify the definitions of BINDIR, ETCDIR, MODULEDIR, etc. to
	point to $(DESTDIR)$(INST_*).  These variables can be used in
	the _install targets without any changes.

10 files changed, 143 insertions, 67 deletions

diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index 3029bafc21c..20dc6038627 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/02/01 22:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/02/27 22:31:52 jlam Exp $
 #
 
 DISTNAME=	ion-2-20040729
@@ -12,10 +12,12 @@ HOMEPAGE=	http://modeemi.fi/~tuomov/ion/
 COMMENT=	Keyboard friendly tiling window manager
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake
-GNU_CONFIGURE=	YES
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+INSTALL_MAKE_FLAGS=	INST_ETCDIR=${EGDIR:Q}
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
diff --git a/wm/ion/distinfo b/wm/ion/distinfo
index f6b73bc5290..a1b33f946c9 100644
--- a/wm/ion/distinfo
+++ b/wm/ion/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2007/08/06 18:16:06 jlam Exp $
+$NetBSD: distinfo,v 1.19 2008/02/27 22:31:52 jlam Exp $
 
 SHA1 (ion-2-20040729.tar.gz) = 92329a392de13dfb79ecd236eeb121a7045327e5
 RMD160 (ion-2-20040729.tar.gz) = a32053c744cc130d9feb07f64bf3fef6cb4fa0c7
@@ -6,13 +6,14 @@ Size (ion-2-20040729.tar.gz) = 399367 bytes
 SHA1 (patch-aa) = c0d85dbd55aee975bfda331ed4d5fa0624c52018
 SHA1 (patch-ab) = 43eadf5e67f579bab2b60075099630cb69f44ef7
 SHA1 (patch-ac) = 7d8ce4c6a5e827a45d8f8c397d783eeda9fd69a1
-SHA1 (patch-ad) = e5c10cf264e1b43144af7dec64c11c588e6384dc
-SHA1 (patch-ae) = 403325bab7298e88232872275287fbde102cd5a3
+SHA1 (patch-ae) = 42fafe3bfac516930f6aaacc20b833dfe614abfb
 SHA1 (patch-af) = aa1871320528f4e3d51686b977e37022cd10c9e5
 SHA1 (patch-ag) = 9dfe4f3b703fc130d4a16a4141b8c815fab0564a
-SHA1 (patch-ah) = f9ae94e9b8240417e7b80c42e8cbedf79676abbc
-SHA1 (patch-ai) = 0bcc1fd90f3e68fe869458387ab91fdb70393748
-SHA1 (patch-aj) = a0a78f7e3f7e6109db80b6da81293a5abefb09c0
+SHA1 (patch-ah) = 67af22b330f0458848cd2bdf7333b3e642e56eed
+SHA1 (patch-aj) = 82cda84b64bb96487fdec303b012d62d70b1344a
 SHA1 (patch-ak) = f2a8f6cb99e69b539d5f1085c638e5ea20fac6e6
 SHA1 (patch-al) = 19941501d9a51b07e113ae46505800b290d4317b
 SHA1 (patch-am) = 2ada18354c7427fb9f9abbc537030fc7d3d1e2a8
+SHA1 (patch-an) = 21e1a01c1b50995b1e84d3de45931443923b9802
+SHA1 (patch-ao) = 5d86031369101887309d79641318cfdf8e0aa0a4
+SHA1 (patch-ap) = 84ec9a39e7f654986b2fb918607f79af03b6c9a9
diff --git a/wm/ion/patches/patch-ad b/wm/ion/patches/patch-ad
deleted file mode 100644
index f61a9cb8144..00000000000
--- a/wm/ion/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/08/14 22:40:53 wiz Exp $
-
---- etc/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
-+++ etc/Makefile
-@@ -21,9 +21,9 @@ include $(TOPDIR)/rules.mk
- ######################################
- 
- _install:
--	$(INSTALLDIR) $(ETCDIR)
-+	$(INSTALLDIR) $(EXDIR)
- 	for i in $(ETC); do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
-+		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
- 	done
--	rm -f $(ETCDIR)/draw.lua
--	ln -s look-cleanviolet.lua $(ETCDIR)/draw.lua
-+	rm -f $(EXDIR)/draw.lua
-+	ln -s look-cleanviolet.lua $(EXDIR)/draw.lua
diff --git a/wm/ion/patches/patch-ae b/wm/ion/patches/patch-ae
index 48dd5cd9e67..281810c1938 100644
--- a/wm/ion/patches/patch-ae
+++ b/wm/ion/patches/patch-ae
@@ -1,17 +1,47 @@
-$NetBSD: patch-ae,v 1.3 2006/08/14 22:40:53 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2008/02/27 22:31:52 jlam Exp $
 
---- pwm/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
+--- pwm/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
 +++ pwm/Makefile
-@@ -55,9 +55,9 @@ pwm: $(OBJS) $(EXT_OBJS)
+@@ -21,23 +21,24 @@ LIBS += $(LTDL_LIBS)
+ EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
+ EXT_OBJS += ../libtu/libtu.a
+ 
+-DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
+-	   -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
+-	   -DLCDIR=\"$(LCDIR)\"
++DEFINES += -DETCDIR=\"$(INST_ETCDIR)\" -DSHAREDIR=\"$(INST_SHAREDIR)\" \
++	   -DEXTRABINDIR=\"$(INST_EXTRABINDIR)\" -DMODULEDIR=\"$(INST_MODULEDIR)\" \
++	   -DLCDIR=\"$(INST_LCDIR)\"
+ 
+ ifndef PWM_ETCDIR
+-PWM_ETCDIR = $(ETCDIR)
++INST_PWM_ETCDIR = $(INST_ETCDIR)
++PWM_ETCDIR = $(DESTDIR)$(INST_PWM_ETCDIR)
+ else
+-DEFINES += -DPWM_ETCDIR=\"$(PWM_ETCDIR)\"
++DEFINES += -DPWM_ETCDIR=\"$(INST_PWM_ETCDIR)\"
+ endif
+ 
+ CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
+ 
+ ifeq ($(PRELOAD_MODULES),1)
+ LDFLAGS += $(foreach mod, $(PWM_MODULE_LIST), -dlpreopen ../$(mod)/$(mod).la)
+-LINKOPTS = -R$(MODULEDIR)
++LINKOPTS = -R$(INST_MODULEDIR)
+ else
+-LINKOPTS = -export-dynamic -R$(MODULEDIR)
++LINKOPTS = -export-dynamic -R$(INST_MODULEDIR)
+ endif
+ 
+ SOURCES = pwm.c
+@@ -55,8 +56,8 @@ pwm: $(OBJS) $(EXT_OBJS)
  
  _install:
  	$(INSTALLDIR) $(BINDIR)
 -	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)
+-	# $(STRIP) $(BINDIR)/pwm
 +	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)/pwm2
- 	# $(STRIP) $(BINDIR)/pwm
--	$(INSTALLDIR) $(PWM_ETCDIR)
-+	$(INSTALLDIR) $(EXDIR)
++	# $(STRIP) $(BINDIR)/pwm2
+ 	$(INSTALLDIR) $(PWM_ETCDIR)
  	for i in $(ETC); do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
-+		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
- 	done
+ 		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
diff --git a/wm/ion/patches/patch-ah b/wm/ion/patches/patch-ah
index 30762b02f03..f203b4daa70 100644
--- a/wm/ion/patches/patch-ah
+++ b/wm/ion/patches/patch-ah
@@ -1,26 +1,50 @@
-$NetBSD: patch-ah,v 1.4 2007/08/06 18:16:06 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2008/02/27 22:31:52 jlam Exp $
 
---- system-ac.mk.in.orig	2004-04-02 08:17:08.000000000 +0000
+--- system-ac.mk.in.orig	2004-04-02 03:17:08.000000000 -0500
 +++ system-ac.mk.in
-@@ -16,11 +16,11 @@ exec_prefix=@exec_prefix@
+@@ -14,25 +14,35 @@ exec_prefix=@exec_prefix@
+ # probably do not want to modify the following directories:
+ 
  # Main binaries
- BINDIR=@bindir@
+-BINDIR=@bindir@
++INST_BINDIR=@bindir@
++BINDIR=$(DESTDIR)$(INST_BINDIR)
  # Configuration .lua files
 -ETCDIR=@sysconfdir@/@PACKAGE_TARNAME@
-+ETCDIR=@sysconfdir@
++INST_ETCDIR=@sysconfdir@
++ETCDIR=$(DESTDIR)$(INST_ETCDIR)
  # Some .lua files and ion-* shell scripts
- SHAREDIR=@datadir@/@PACKAGE_TARNAME@
+-SHAREDIR=@datadir@/@PACKAGE_TARNAME@
++INST_SHAREDIR=@datadir@/@PACKAGE_TARNAME@
++SHAREDIR=$(DESTDIR)$(INST_SHAREDIR)
  # Manual pages
 -MANDIR=@datadir@/man
-+MANDIR=@mandir@
++INST_MANDIR=@mandir@
++MANDIR=$(DESTDIR)$(INST_MANDIR)
  # Some documents
- DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
+-DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
++INST_DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
++DOCDIR=$(DESTDIR)$(INST_DOCDIR)
+ # Nothing at the moment
+-INCDIR=@includedir@
++INST_INCDIR=@includedir@
++INCDIR=$(DESTDIR)$(INST_INCDIR)
  # Nothing at the moment
-@@ -33,6 +33,7 @@ MODULEDIR=@libdir@/@PACKAGE_TARNAME@
- LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
+-LIBDIR=@libdir@
++INST_LIBDIR=@libdir@
++LIBDIR=$(DESTDIR)$(INST_LIBDIR)
+ # Modules
+-MODULEDIR=@libdir@/@PACKAGE_TARNAME@
++INST_MODULEDIR=@libdir@/@PACKAGE_TARNAME@
++MODULEDIR=$(DESTDIR)$(INST_MODULEDIR)
+ # Compiled Lua source code
+-LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
++INST_LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
++LCDIR=$(DESTDIR)$(INST_LCDIR)
  # ion-completefile (does not belong in SHAREDIR being a binary file)
- EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
-+EXDIR=@datadir@/examples/@PACKAGE_TARNAME@
+-EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
++INST_EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
++EXTRABINDIR=$(DESTDIR)$(INST_EXTRABINDIR)
  
  ##
  ## Modules
diff --git a/wm/ion/patches/patch-ai b/wm/ion/patches/patch-ai
deleted file mode 100644
index fbf22c587dd..00000000000
--- a/wm/ion/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2006/08/14 22:40:53 wiz Exp $
-
---- dock/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
-+++ dock/Makefile
-@@ -28,9 +28,9 @@ include $(TOPDIR)/rules.mk
- ######################################
- 
- _install: module_install
--	$(INSTALLDIR) $(ETCDIR)
-+	$(INSTALLDIR) $(EXDIR)
- 	for i in $(ETC); do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
-+		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
- 	done
- 
- ######################################
diff --git a/wm/ion/patches/patch-aj b/wm/ion/patches/patch-aj
index a41c2900eb5..f2286c661ff 100644
--- a/wm/ion/patches/patch-aj
+++ b/wm/ion/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2006/08/14 22:40:53 wiz Exp $
+$NetBSD: patch-aj,v 1.3 2008/02/27 22:31:52 jlam Exp $
 
---- man/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
+--- man/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
 +++ man/Makefile
 @@ -22,7 +22,7 @@ include $(TOPDIR)/rules.mk
  _install:
diff --git a/wm/ion/patches/patch-an b/wm/ion/patches/patch-an
new file mode 100644
index 00000000000..6a4a335341a
--- /dev/null
+++ b/wm/ion/patches/patch-an
@@ -0,0 +1,27 @@
+$NetBSD: patch-an,v 1.1 2008/02/27 22:31:52 jlam Exp $
+
+--- ion/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
++++ ion/Makefile
+@@ -21,17 +21,17 @@ LIBS += $(LTDL_LIBS)
+ EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
+ EXT_OBJS += ../libtu/libtu.a
+ 
+-DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
+-           -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
+-	   -DLCDIR=\"$(LCDIR)\"
++DEFINES += -DETCDIR=\"$(INST_ETCDIR)\" -DSHAREDIR=\"$(INST_SHAREDIR)\" \
++           -DEXTRABINDIR=\"$(INST_EXTRABINDIR)\" -DMODULEDIR=\"$(INST_MODULEDIR)\" \
++	   -DLCDIR=\"$(INST_LCDIR)\"
+ 
+ CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
+ 
+ ifeq ($(PRELOAD_MODULES),1)
+ LDFLAGS += $(foreach mod, $(MODULE_LIST), -dlpreopen ../$(mod)/$(mod).la)
+-LINKOPTS = -R$(MODULEDIR)
++LINKOPTS = -R$(INST_MODULEDIR)
+ else
+-LINKOPTS = -export-dynamic -R$(MODULEDIR)
++LINKOPTS = -export-dynamic -R$(INST_MODULEDIR)
+ endif
+ 
+ SOURCES=ion.c
diff --git a/wm/ion/patches/patch-ao b/wm/ion/patches/patch-ao
new file mode 100644
index 00000000000..6f99aedf40d
--- /dev/null
+++ b/wm/ion/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2008/02/27 22:31:52 jlam Exp $
+
+--- libtu/rules.mk.orig	2004-07-28 23:10:32.000000000 -0400
++++ libtu/rules.mk
+@@ -86,7 +86,7 @@ endif
+ 
+ $(MODULE).la: $(OBJS) $(EXT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) $(LINKOPT) $(LDFLAGS) \
+- 	-rpath $(MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
++ 	-rpath $(INST_MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
+ 
+ module_install:
+ 	$(INSTALLDIR) $(MODULEDIR)
diff --git a/wm/ion/patches/patch-ap b/wm/ion/patches/patch-ap
new file mode 100644
index 00000000000..6e19a66ead1
--- /dev/null
+++ b/wm/ion/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2008/02/27 22:31:52 jlam Exp $
+
+--- rules.mk.orig	2004-07-28 23:10:32.000000000 -0400
++++ rules.mk
+@@ -86,7 +86,7 @@ endif
+ 
+ $(MODULE).la: $(OBJS) $(EXT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) $(LINKOPT) $(LDFLAGS) \
+- 	-rpath $(MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
++ 	-rpath $(INST_MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
+ 
+ module_install:
+ 	$(INSTALLDIR) $(MODULEDIR)