Sun Apr 19 00:50:11 2009 UTC ()
Create Libraries directory for gnustep bundles.
Bump PKGREVISION.
(rh)
diff -r1.45 -r1.46 pkgsrc/devel/gnustep-make/Makefile
diff -r1.17 -r1.18 pkgsrc/devel/gnustep-make/PLIST
diff -r1.15 -r1.16 pkgsrc/devel/gnustep-make/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/devel/gnustep-make/gnustep.mk
--- pkgsrc/devel/gnustep-make/Makefile 2009/04/18 03:10:33 1.45
+++ pkgsrc/devel/gnustep-make/Makefile 2009/04/19 00:50:11 1.46
@@ -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_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
--- pkgsrc/devel/gnustep-make/PLIST 2009/04/18 01:09:03 1.17
+++ pkgsrc/devel/gnustep-make/PLIST 2009/04/19 00:50:11 1.18
@@ -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 @@
@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
--- pkgsrc/devel/gnustep-make/buildlink3.mk 2009/04/18 03:10:33 1.15
+++ pkgsrc/devel/gnustep-make/buildlink3.mk 2009/04/19 00:50:11 1.16
@@ -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_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\/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; }
--- pkgsrc/devel/gnustep-make/gnustep.mk 2009/04/19 00:09:49 1.14
+++ pkgsrc/devel/gnustep-make/gnustep.mk 2009/04/19 00:50:11 1.15
@@ -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_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