Tue Dec 13 04:56:11 2011 UTC ()
Fix missing $(DESTDIR) on call to mkinstalldirs. Does not fix build,
now has plist issues; not sure what the deal with those is.


(dholland)
diff -r1.2 -r1.3 pkgsrc/wm/fvwm-themes/distinfo
diff -r1.1 -r1.2 pkgsrc/wm/fvwm-themes/patches/patch-Makefile.am
diff -r1.1 -r1.2 pkgsrc/wm/fvwm-themes/patches/patch-Makefile.in
cvs diff -r1.2 -r1.3 pkgsrc/wm/fvwm-themes/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/fvwm-themes/distinfo 2011/07/09 14:20:53 1.2
+++ pkgsrc/wm/fvwm-themes/distinfo 2011/12/13 04:56:10 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.2 2011/07/09 14:20:53 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2011/12/13 04:56:10 dholland Exp $
2 2
3SHA1 (fvwm-themes-0.6.2.tar.bz2) = 63e2ed90bd172494611d3d37a418406c8e61bb27 3SHA1 (fvwm-themes-0.6.2.tar.bz2) = 63e2ed90bd172494611d3d37a418406c8e61bb27
4RMD160 (fvwm-themes-0.6.2.tar.bz2) = 49706c0d2a367d2a2877ea5d1030397314ec211f 4RMD160 (fvwm-themes-0.6.2.tar.bz2) = 49706c0d2a367d2a2877ea5d1030397314ec211f
5Size (fvwm-themes-0.6.2.tar.bz2) = 592419 bytes 5Size (fvwm-themes-0.6.2.tar.bz2) = 592419 bytes
6SHA1 (fvwm-themes-extra-0.6.2.tar.bz2) = 3112f6ac44453f0fe1ec97553d6b167483f64012 6SHA1 (fvwm-themes-extra-0.6.2.tar.bz2) = 3112f6ac44453f0fe1ec97553d6b167483f64012
7RMD160 (fvwm-themes-extra-0.6.2.tar.bz2) = c78e47d355638760a990477c990e2f705dd347e7 7RMD160 (fvwm-themes-extra-0.6.2.tar.bz2) = c78e47d355638760a990477c990e2f705dd347e7
8Size (fvwm-themes-extra-0.6.2.tar.bz2) = 378884 bytes 8Size (fvwm-themes-extra-0.6.2.tar.bz2) = 378884 bytes
9SHA1 (patch-Makefile.am) = 3ffd7c82bc3102abfcbe31d1050a12612ab39d21 9SHA1 (patch-Makefile.am) = 78d472478f75e84fdec3f921051ffb0fd52f75f3
10SHA1 (patch-Makefile.in) = ac08d78e293916ef2289b1a266d279b9028d4fde 10SHA1 (patch-Makefile.in) = 5b4c4a82d76b3a253c21bf96007f31a4c8133f4c
11SHA1 (patch-bin_Makefile.in) = 374482a3e72ebd312bbacd2e39e51e3460511c04 11SHA1 (patch-bin_Makefile.in) = 374482a3e72ebd312bbacd2e39e51e3460511c04
12SHA1 (patch-bin_fvwm-themes-config-destdir.in) = 07913ca78721c6d3c53a7caad2e9834e6bd3cd05 12SHA1 (patch-bin_fvwm-themes-config-destdir.in) = 07913ca78721c6d3c53a7caad2e9834e6bd3cd05
cvs diff -r1.1 -r1.2 pkgsrc/wm/fvwm-themes/patches/patch-Makefile.am (expand / switch to unified diff)

--- pkgsrc/wm/fvwm-themes/patches/patch-Makefile.am 2011/07/09 14:20:53 1.1
+++ pkgsrc/wm/fvwm-themes/patches/patch-Makefile.am 2011/12/13 04:56:10 1.2
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
1$NetBSD: patch-Makefile.am,v 1.1 2011/07/09 14:20:53 wiz Exp $ 1$NetBSD: patch-Makefile.am,v 1.2 2011/12/13 04:56:10 dholland Exp $
2 2
3Use destdir fake version at install target: 3- Use destdir fake version at install target.
 4- Fix missing DESTDIR in mkinstalldirs invocation.
4 5
5--- work/fvwm-themes-0.6.2/Makefile.am.orig 2002-12-06 02:01:37.000000000 +0000 6--- Makefile.am.orig 2002-12-06 02:01:37.000000000 +0000
6+++ Makefile.am 7+++ Makefile.am
 8@@ -18,7 +18,7 @@ install-data-local:
 9 RUN_UPDATEMENU=@RUN_UPDATEMENU@
 10 UPDATE_MENU=@UPDATE_MENU@
 11
 12- $(mkinstalldirs) $(FT_DATADIR)
 13+ $(mkinstalldirs) $(DESTDIR)$(FT_DATADIR)
 14 for dir in $(FT_DATA_SUBDIRS); do \
 15 chmod -R o-w,go+rX $$dir 2>/dev/null || true; \
 16 rm -rf "$(DESTDIR)$(FT_DATADIR)/$$dir"; \
7@@ -33,10 +33,10 @@ install-data-local: 17@@ -33,10 +33,10 @@ install-data-local:
8 mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE) 18 mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
9  19
10 PATH="$(DESTDIR)$(bindir):$(FVWM_BINDIR):$$PATH"; \ 20 PATH="$(DESTDIR)$(bindir):$(FVWM_BINDIR):$$PATH"; \
11- $(DESTDIR)$(bindir)/fvwm-themes-config --site --reset 21- $(DESTDIR)$(bindir)/fvwm-themes-config --site --reset
12+ $(DESTDIR)$(bindir)/fvwm-themes-config-destdir --site --reset 22+ $(DESTDIR)$(bindir)/fvwm-themes-config-destdir --site --reset
13  23
14 if test "$(BUILD_MENUS)" = "yes"; then \ 24 if test "$(BUILD_MENUS)" = "yes"; then \
15- $(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \ 25- $(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
16+ $(DESTDIR)$(bindir)/fvwm-themes-menuapp-destdir --site --build-menus --remove-popup; \ 26+ $(DESTDIR)$(bindir)/fvwm-themes-menuapp-destdir --site --build-menus --remove-popup; \
17 fi 27 fi
18  28
19 if test "$(GNOME_ICONS)" = "yes"; then \ 29 if test "$(GNOME_ICONS)" = "yes"; then \
cvs diff -r1.1 -r1.2 pkgsrc/wm/fvwm-themes/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/wm/fvwm-themes/patches/patch-Makefile.in 2011/07/09 14:20:53 1.1
+++ pkgsrc/wm/fvwm-themes/patches/patch-Makefile.in 2011/12/13 04:56:10 1.2
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
1$NetBSD: patch-Makefile.in,v 1.1 2011/07/09 14:20:53 wiz Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2011/12/13 04:56:10 dholland Exp $
2 2
3Use destdir fake version at install target: 3- Use destdir fake version at install target.
 4- Fix missing DESTDIR in mkinstalldirs invocation.
4 5
5--- work/fvwm-themes-0.6.2/Makefile.in.orig 2002-12-06 02:59:28.000000000 +0000 6--- Makefile.in.orig 2002-12-06 02:59:28.000000000 +0000
6+++ ./Makefile.in 7+++ Makefile.in
 8@@ -357,7 +357,7 @@ install-data-local:
 9 RUN_UPDATEMENU=@RUN_UPDATEMENU@
 10 UPDATE_MENU=@UPDATE_MENU@
 11
 12- $(mkinstalldirs) $(FT_DATADIR)
 13+ $(mkinstalldirs) $(DESTDIR)$(FT_DATADIR)
 14 for dir in $(FT_DATA_SUBDIRS); do \
 15 chmod -R o-w,go+rX $$dir 2>/dev/null || true; \
 16 rm -rf "$(DESTDIR)$(FT_DATADIR)/$$dir"; \
7@@ -372,10 +372,10 @@ install-data-local: 17@@ -372,10 +372,10 @@ install-data-local:
8 mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE) 18 mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
9  19
10 PATH="$(DESTDIR)$(bindir):$(FVWM_BINDIR):$$PATH"; \ 20 PATH="$(DESTDIR)$(bindir):$(FVWM_BINDIR):$$PATH"; \
11- $(DESTDIR)$(bindir)/fvwm-themes-config --site --reset 21- $(DESTDIR)$(bindir)/fvwm-themes-config --site --reset
12+ $(DESTDIR)$(bindir)/fvwm-themes-config-destdir --site --reset 22+ $(DESTDIR)$(bindir)/fvwm-themes-config-destdir --site --reset
13  23
14 if test "$(BUILD_MENUS)" = "yes"; then \ 24 if test "$(BUILD_MENUS)" = "yes"; then \
15- $(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \ 25- $(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
16+ $(DESTDIR)$(bindir)/fvwm-themes-menuapp-destdir --site --build-menus --remove-popup; \ 26+ $(DESTDIR)$(bindir)/fvwm-themes-menuapp-destdir --site --build-menus --remove-popup; \
17 fi 27 fi
18  28
19 if test "$(GNOME_ICONS)" = "yes"; then \ 29 if test "$(GNOME_ICONS)" = "yes"; then \