Create Libraries directory for gnustep bundles.

Bump PKGREVISION.

4 files changed, 14 insertions, 8 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 3ff3ca93169..70dcb54fc2f 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2009/04/18 03:10:33 rh Exp $
+# $NetBSD: Makefile,v 1.46 2009/04/19 00:50:11 rh Exp $
 
 DISTNAME=	gnustep-make-2.0.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -55,6 +55,7 @@ SUBST_FILES.maninfo=	${WRKSRC}/FilesystemLayouts/fhs
 SUBST_SED.maninfo=	-e 's|share/man|${PKGMANDIR}|'
 SUBST_SED.maninfo+=	-e 's|share/info|${PKGINFODIR}|'
 
+INSTALLATION_DIRS+=	share/GNUstep/Library
 INSTALLATION_DIRS+=	share/GNUstep/Makefiles/${GNUSTEP_ARCH}
 INSTALLATION_DIRS+=	share/GNUstep/Makefiles/Additional
 INSTALLATION_DIRS+=	share/GNUstep/Makefiles/Auxiliary
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index 05ea8f66d96..48a7d2f50bb 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/04/18 01:09:03 rh Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/04/19 00:50:11 rh Exp $
 bin/debugapp
 bin/gnustep-config
 bin/openapp
@@ -136,6 +136,8 @@ man/man7/library-combo.7
 @exec ${MKDIR} %D/share/GNUstep/Makefiles/Auxiliary
 @dirrm share/GNUstep/Makefiles/Auxiliary
 @exec ${MKDIR} %D/share/GNUstep/Makefiles/Additional
-@unexec ${RMDIR} %D/share/GNUstep/Makefiles/Additional 2>/dev/null || ${TRUE}
+@dirrm share/GNUstep/Makefiles/Additional
 @dirrm share/GNUstep/Makefiles
 @unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE}
+@dirrm share/GNUstep/Library
+@exec ${MKDIR} %D/share/GNUstep/Library
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index a448176b4c3..efcc763b6e8 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/04/18 03:10:33 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/04/19 00:50:11 rh Exp $
 
 BUILDLINK_TREE+=	gnustep-make
 
 .if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
 GNUSTEP_MAKE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.0.8nb1
-BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=2.0.8nb1
+BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=2.0.8nb2
+BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=2.0.8nb2
 BUILDLINK_PKGSRCDIR.gnustep-make?=	../../devel/gnustep-make
 
 .include "../../devel/gnustep-make/gnustep.mk"
@@ -15,6 +15,7 @@ BUILDLINK_LIBDIRS.gnustep-make=	lib ${GNUSTEP_BLDIRS}
 BUILDLINK_INCDIRS.gnustep-make=	include ${GNUSTEP_BIDIRS}
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Library$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Additional$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
@@ -25,6 +26,7 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { prin
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/Makefiles\/Master$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/examples\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Library$$/ { next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles$$/ { next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Additional$$/ { next; }
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 5b2b417ae0d..9f09039ea71 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: gnustep.mk,v 1.14 2009/04/19 00:09:49 rh Exp $
+#	$NetBSD: gnustep.mk,v 1.15 2009/04/19 00:50:11 rh Exp $
 
 .if !defined(GNUSTEP_MK)
 GNUSTEP_MK=		#defined
@@ -45,6 +45,7 @@ SUBST_STAGE.gnustep_installation_dir=	post-patch
 SUBST_FILES.gnustep_installation_dir?=	GNUmakefile
 SUBST_SED.gnustep_installation_dir+=	-e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTEP_\(.*\)_ROOT.*|GNUSTEP_INSTALLATION_DOMAIN = \1|'
 SUBST_SED.gnustep_installation_dir+=	-e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME}|g'
+SUBST_SED.gnustep_installation_dir+=	-e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Library|$${DESTDIR}${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Library|g'
 SUBST_SED.gnustep_installation_dir+=	-e 's|INSTALL_ROOT_DIR|DESTDIR|g'
 .endif