Add full user-destdir support.

Fix installation directories.
Bump PKGREVISION.
This commit is contained in:
rh 2009-04-19 09:21:24 +00:00
parent 64e3e5d42e
commit bab89aa973
3 changed files with 50 additions and 10 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.33 2009/04/13 12:26:38 rh Exp $
# $NetBSD: Makefile,v 1.34 2009/04/19 09:21:24 rh Exp $
DISTNAME= Preferences-1.2.0
PKGNAME= gnustep-${DISTNAME:S/P/p/}
PKGREVISION= 18
PKGREVISION= 19
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prefsapp/}
EXTRACT_SUFX= .tar.bz2
@ -11,7 +11,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://prefsapp.sourceforge.net/
COMMENT= Application for setting preferences for the GNUstep system
PKG_DESTDIR_SUPPORT= destdir
PKG_DESTDIR_SUPPORT= user-destdir
LICENSE= gnu-gpl-v2
@ -23,6 +23,12 @@ MAKE_FILE= GNUmakefile
MAKE_JOBS_SAFE= NO
MAKE_FLAGS+= GNUSTEP_USER_DIR=${WRKDIR}/fake_home/GNUstep
FIX_GNUSTEP_INSTALLATION_DIR= yes
SUBST_FILES.gnustep_installation_dir+= GNUmakefile.preamble
SUBST_FILES.gnustep_installation_dir+= PrefsModule/GNUmakefile.preamble
SUBST_FILES.gnustep_installation_dir+= Modules/Keyboard/GNUmakefile
SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences|$${DESTDIR}${GNUSTEP_LIB_DIR}/Preferences|'
.include "../../x11/gnustep-back/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.9 2009/04/13 12:26:38 rh Exp $
@comment $NetBSD: PLIST,v 1.10 2009/04/19 09:21:24 rh Exp $
bin/Preferences
include/PrefsModule
lib/GNUstep/Applications/Preferences.app/Preferences
@ -31,17 +31,25 @@ lib/GNUstep/Frameworks/PrefsModule.framework/Versions/0/libPrefsModule.so
lib/GNUstep/Frameworks/PrefsModule.framework/Versions/0/libPrefsModule.so.0.0.1
lib/GNUstep/Frameworks/PrefsModule.framework/Versions/Current
lib/GNUstep/Frameworks/PrefsModule.framework/libPrefsModule.so
lib/GNUstep/Preferences/Keyboard.prefs/Keyboard
lib/GNUstep/Preferences/Keyboard.prefs/Resources/Info-gnustep.plist
lib/GNUstep/Preferences/Keyboard.prefs/Resources/Keyboard.gorm
lib/GNUstep/Preferences/Keyboard.prefs/stamp.make
lib/libPrefsModule.so
lib/libPrefsModule.so.0.0.1
@dirrm lib/GNUstep/Preferences/Keyboard.prefs/Resources
@dirrm lib/GNUstep/Preferences/Keyboard.prefs
@dirrm lib/GNUstep/Preferences
@dirrm lib/GNUstep/Frameworks/PrefsModule.framework/Versions/0/Resources
@dirrm lib/GNUstep/Frameworks/PrefsModule.framework/Versions/0/Headers
@dirrm lib/GNUstep/Frameworks/PrefsModule.framework/Versions/0
@dirrm lib/GNUstep/Frameworks/PrefsModule.framework/Versions
@dirrm lib/GNUstep/Frameworks/PrefsModule.framework
@comment in x11/gnustep-base: @dirrm lib/GNUstep/Frameworks
@dirrm lib/GNUstep/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
@dirrm lib/GNUstep/Applications/Preferences.app/Resources/PrefsApp.prefs
@dirrm lib/GNUstep/Applications/Preferences.app/Resources/English.lproj
@dirrm lib/GNUstep/Applications/Preferences.app/Resources
@dirrm lib/GNUstep/Applications/Preferences.app
@comment in devel/gnustep-gui: @dirrm lib/GNUstep/Applications
@comment in x11/gnustep-gui: @dirrm lib/GNUstep/Applications
@comment in devel/gnustep-base: @dirrm lib/GNUstep

View file

@ -1,15 +1,41 @@
# $NetBSD: buildlink3.mk,v 1.12 2009/04/13 12:26:38 rh Exp $
# $NetBSD: buildlink3.mk,v 1.13 2009/04/19 09:21:24 rh Exp $
BUILDLINK_TREE+= gnustep-preferences
.if !defined(GNUSTEP_PREFERENCES_BUILDLINK3_MK)
GNUSTEP_PREFERENCES_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnustep-preferences+= gnustep-preferences>=1.2.0nb18
BUILDLINK_ABI_DEPENDS.gnustep-preferences+= gnustep-preferences>=1.2.0nb18
BUILDLINK_API_DEPENDS.gnustep-preferences+= gnustep-preferences>=1.2.0nb19
BUILDLINK_PKGSRCDIR.gnustep-preferences?= ../../x11/gnustep-preferences
.include "../../x11/gnustep-back/buildlink3.mk"
.endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Headers$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Preferences$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Preferences\/Keyboard.prefs$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@dirrm lib\/GNUstep\/Preferences\/Keyboard.prefs\/Resources$$/ { print "@comment in x11/gnustep-preferences: " $$0; next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/English.lproj$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Applications\/Preferences.app\/Resources\/PrefsApp.prefs\/Resources$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Headers$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Frameworks\/PrefsModule.framework\/Versions\/0\/Resources$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences\/Keyboard.prefs$$/ { next; }
PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/lib\/GNUstep\/Preferences\/Keyboard.prefs\/Resources$$/ { next; }
#.include "../../x11/gnustep-back/buildlink3.mk"
.endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK
BUILDLINK_TREE+= -gnustep-preferences