Fix PLIST and while at it, replace home-grown method of specifying paths

with the standard definitions from gnustep-make's buildlink2.mk.
Bump PKGREVISION.
This commit is contained in:
rh 2003-05-06 05:58:53 +00:00
parent e04ee0184d
commit 02bd691004
2 changed files with 27 additions and 35 deletions

View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.5 2003/05/05 19:05:25 jmmv Exp $
# $NetBSD: Makefile,v 1.6 2003/05/06 05:58:53 rh Exp $
#
DISTNAME= Preferences-1.2.0
PKGNAME= gnustep-${DISTNAME:S/P/p/}
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prefsapp/}
EXTRACT_SUFX= .tar.bz2
@ -18,18 +18,6 @@ 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"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2003/03/07 03:00:40 jmc Exp $
@comment $NetBSD: PLIST,v 1.4 2003/05/06 05:58:53 rh 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,8 @@ 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/${ARCH_LOC}/gnu-gnu-gnu/PrefsApp
share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PrefsApp
share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
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 +18,45 @@ 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/${ARCH_LOC}/gnu-gnu-gnu/Preferences
share/GNUstep/System/Applications/Preferences.app/${ARCH_LOC}/gnu-gnu-gnu/library_paths.openapp
share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/Preferences
share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/library_paths.openapp
share/GNUstep/System/Applications/Preferences.app/stamp.make
share/GNUstep/System/Headers/PrefsModule
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/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libPrefsModule.so
share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/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/${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/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PrefsModule
share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libPrefsModule.so
share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/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/${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}
share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/Keyboard
share/GNUstep/System/Library/Preferences/Keyboard.prefs/stamp.make
@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
@dirrm share/GNUstep/System/Library/Preferences/Keyboard.prefs/${GNUSTEP_HOST_CPU}
@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/${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/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
@dirrm share/GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/A/${GNUSTEP_HOST_CPU}
@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/${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/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
@dirrm share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
@dirrm share/GNUstep/System/Applications/Preferences.app/${GNUSTEP_HOST_CPU}
@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
@dirrm share/GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/${GNUSTEP_HOST_CPU}
@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