Provide a PLIST_SUBST pattern for the machine specific directory installs

2 files changed, 35 insertions, 23 deletions

diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index 9eed7c88dac..d36fc04db78 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/03 05:20:39 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/07 03:00:40 jmc Exp $
 #
 
 DISTNAME=	Preferences-1.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prefsapp/}
@@ -18,6 +18,18 @@ USE_GMAKE=	YES
 USE_X11=	YES
 MAKEFILE=	GNUmakefile
 
+#
+# Gnustep seems to use it's own idea of architecture names and at least for
+# i386 is using ix86. For other archs default for MACHINE_ARCH.
+# Tested specifically on x86 and powerpc
+.if (${MACHINE_ARCH} == "i386")
+PLIST_SUBST+= 	ARCH="ix86"
+PLIST_SUBST+=	ARCH_LOC="ix86/${LOWER_OPSYS}elf"
+.else
+PLIST_SUBST+=	ARCH="${MACHINE_ARCH}"
+PLIST_SUBST+=	ARCH_LOC="${MACHINE_ARCH}/${LOWER_OPSYS}"
+.endif
+
 .include "../../x11/gnustep-back/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnustep-preferences/PLIST b/x11/gnustep-preferences/PLIST
index aea2b2fd879..aebf1ca9866 100644
--- a/x11/gnustep-preferences/PLIST
+++ b/x11/gnustep-preferences/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/03 05:20:40 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/07 03:00:40 jmc Exp $
 share/GNUstep/System/Applications/Preferences.app/Preferences
 share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj/Localizable.strings
 share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj/Preferences.gorm
@@ -8,7 +8,7 @@ share/GNUstep/System/Applications/Preferences.app/Resources/Preferences.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PreferencesInfo.plist
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/Info-gnustep.plist
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
-share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/PrefsApp
+share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${ARCH_LOC}/gnu-gnu-gnu/PrefsApp
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Appearances.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Keyboard.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Localisation.tiff
@@ -17,42 +17,42 @@ share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Mouse.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_Screen.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsIcon_SelectSpooler.tiff
 share/GNUstep/System/Applications/Preferences.app/Resources/PrefsModule.tiff
-share/GNUstep/System/Applications/Preferences.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/Preferences
-share/GNUstep/System/Applications/Preferences.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
+share/GNUstep/System/Applications/Preferences.app/${ARCH_LOC}/gnu-gnu-gnu/Preferences
+share/GNUstep/System/Applications/Preferences.app/${ARCH_LOC}/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/System/Headers/PrefsModule
-share/GNUstep/System/Libraries/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/libPrefsModule.so
-share/GNUstep/System/Libraries/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/libPrefsModule.so.1.0.0
+share/GNUstep/System/Libraries/${ARCH_LOC}/gnu-gnu-gnu/libPrefsModule.so
+share/GNUstep/System/Libraries/${ARCH_LOC}/gnu-gnu-gnu/libPrefsModule.so.1.0.0
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Headers
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Resources
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers/PrefsModule.h
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info.plist
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/libPrefsModule.so
-share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/libPrefsModule.so.1.0.0
+share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${ARCH_LOC}/gnu-gnu-gnu/libPrefsModule.so
+share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${ARCH_LOC}/gnu-gnu-gnu/libPrefsModule.so.1.0.0
 share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/Current
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources/Keyboard.gorm
-share/GNUstep/System/Library/Preferences/Keyboard.prefs/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/Keyboard
-@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/ix86
+share/GNUstep/System/Library/Preferences/Keyboard.prefs/${ARCH_LOC}/gnu-gnu-gnu/Keyboard
+@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${ARCH_LOC}/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${ARCH_LOC}
+@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${ARCH}
 @dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/Resources
 @dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs
 @dirrm share/GNUstep/System/Library/Preferences
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/ix86
+@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${ARCH_LOC}/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${ARCH_LOC}
+@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${ARCH}
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions
 @dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework
-@dirrm share/GNUstep/System/Applications/Preferences.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/Preferences.app/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/System/Applications/Preferences.app/ix86
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/ix86/${LOWER_OPSYS}elf
-@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/ix86
+@dirrm share/GNUstep/System/Applications/Preferences.app/${ARCH_LOC}/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/Preferences.app/${ARCH_LOC}
+@dirrm share/GNUstep/System/Applications/Preferences.app/${ARCH}
+@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${ARCH_LOC}/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${ARCH_LOC}
+@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${ARCH}
 @dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
 @dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs
 @dirrm share/GNUstep/System/Applications/Preferences.app/Resources/English.lproj