summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gnustep.mk20
-rw-r--r--devel/gnustep-make/Makefile17
-rw-r--r--devel/gnustep-make/distinfo2
-rw-r--r--devel/gnustep-make/files/configure.patch11
-rw-r--r--devel/gnustep-make/files/target.make.patch (renamed from devel/gnustep-make/files/patch-target.make)0
-rw-r--r--devel/gnustep-make/files/target.make.patch-devel13
-rw-r--r--devel/gnustep-make/pkg-plist15
-rw-r--r--devel/gnustep/Makefile12
-rw-r--r--devel/gnustep/bsd.gnustep.mk20
-rw-r--r--lang/gnustep-base/Makefile2
-rw-r--r--lang/gnustep-base/distinfo2
-rw-r--r--lang/gnustep-base/pkg-plist67
12 files changed, 113 insertions, 68 deletions
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
index efbc987e1013..db3ffd5027fe 100644
--- a/Mk/bsd.gnustep.mk
+++ b/Mk/bsd.gnustep.mk
@@ -66,11 +66,12 @@ SYSTEMDIR= ${PREFIX}/System
SYSMAKEDIR= ${SYSTEMDIR}/Makefiles
COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
.if defined(WITH_GNUSTEP_DEVEL)
-SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
-COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries/${COMBOPATH}
-LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries/${COMBOPATH}
+SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries
+COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries
+LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries
PLIST_SUB+= SYSTEMLIBRARY="System/Library"
PLIST_SUB+= LOCALLIBRARY="Local/Library"
+PLIST_SUB+= NOFLAT=""
PLIST_SUB+= GNUSTEP_DEVEL=""
PLIST_SUB+= GNUSTEP_STABLE="@comment "
PKGNAMESUFFIX?= -devel
@@ -80,6 +81,7 @@ COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${COMBOPATH}
LOCALLIBDIR= ${PREFIX}/Local/Libraries/${COMBOPATH}
PLIST_SUB+= SYSTEMLIBRARY="System"
PLIST_SUB+= LOCALLIBRARY="Local"
+PLIST_SUB+= NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
PLIST_SUB+= GNUSTEP_DEVEL="@comment "
PLIST_SUB+= GNUSTEP_STABLE=""
.else
@@ -126,7 +128,11 @@ USE_GNUSTEP_XLIB=yes
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle
+.else
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
+.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=back
.endif
@@ -137,7 +143,11 @@ MAKE_FLAGS+= GUI_BACKEND_LIB=back
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-xdps.bundle
+.else
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-xdps.bundle/${COMBOPATH}
+.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=xdps
.endif
@@ -148,7 +158,11 @@ MAKE_FLAGS+= GUI_BACKEND_LIB=xdps
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-art.bundle
+.else
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-art.bundle/${COMBOPATH}
+.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=art
.endif
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 360f06f58714..ff7a9b41948a 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-make
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.7.1
+PORTVERSION= 1.7.2
.else
PORTVERSION= 1.6.0
.endif
@@ -18,7 +18,9 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP} \
ftp://ftp.easynet.nl/mirror/GNUstep/%SUBDIR%/
MASTER_SITE_SUBDIR= core
.if defined(WITH_GNUSTEP_DEVEL)
-EXTRA_PATCHES+= ${FILESDIR}/configure.patch
+EXTRA_PATCHES+= ${FILESDIR}/target.make.patch-devel
+.else
+EXTRA_PATCHES+= ${FILESDIR}/target.make.patch
.endif
MAINTAINER= dinoex@FreeBSD.org
@@ -34,6 +36,12 @@ USE_GMAKE= yes
MAKEFILE=
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
+.if defined(WITH_GNUSTEP_DEVEL)
+PLIST_SUB+= NOFLAT2=""
+.else
+PLIST_SUB+= NOFLAT2="${GNU_ARCH}/${OPSYS:L}/"
+.endif
+
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/gnustep/bsd.gnustep.mk"
@@ -43,9 +51,4 @@ post-configure:
${SED} -e "s|\(objc_threaded:=\).*|\1 ${PTHREAD_LIBS}|" \
< ${WRKSRC}/config.make.sed > ${WRKSRC}/config.make
-.if defined(WITH_GNUSTEP_DEVEL)
-post-install:
- ${RM} -f ${PREFIX}/System/Makefiles/Makefiles
-
-.endif
.include <bsd.port.post.mk>
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 26aeb4bfc334..48dbad60db5e 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,2 +1,2 @@
MD5 (gnustep-make-1.6.0.tar.gz) = e17e758ee9ab5bbe24dcc01fdafdb13c
-MD5 (gnustep-make-1.7.1.tar.gz) = 5b349dd804785f335392ef4749e72a6d
+MD5 (gnustep-make-1.7.2.tar.gz) = 4f6d66701ad909e57f2dba5db7f2bb54
diff --git a/devel/gnustep-make/files/configure.patch b/devel/gnustep-make/files/configure.patch
deleted file mode 100644
index 2bb5871d3242..000000000000
--- a/devel/gnustep-make/files/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Tue May 20 05:22:53 2003
-+++ configure Tue May 27 23:48:05 2003
-@@ -2902,7 +2902,7 @@
- # Makefiles dir in the previous location, reset this variable to
- # 'Makefiles' and regenerate configure. Note this doesn't change all
- # occurances.
--MAKEFILES_SUFFIX=Library/Makefiles
-+MAKEFILES_SUFFIX=Makefiles
-
-
- # HOST_INSTALL is the name of the install program in config.make so set it up
diff --git a/devel/gnustep-make/files/patch-target.make b/devel/gnustep-make/files/target.make.patch
index 3cb68f66f430..3cb68f66f430 100644
--- a/devel/gnustep-make/files/patch-target.make
+++ b/devel/gnustep-make/files/target.make.patch
diff --git a/devel/gnustep-make/files/target.make.patch-devel b/devel/gnustep-make/files/target.make.patch-devel
new file mode 100644
index 000000000000..f9eb7ddccbad
--- /dev/null
+++ b/devel/gnustep-make/files/target.make.patch-devel
@@ -0,0 +1,13 @@
+--- target.make.orig Tue Jul 22 05:03:27 2003
++++ target.make Thu Jul 24 10:23:35 2003
+@@ -36,8 +36,8 @@
+ #
+ TARGET_SYSTEM_LIBS = $(CONFIG_SYSTEM_LIBS) -lm
+ ifneq ("$(objc_threaded)","")
+- INTERNAL_CFLAGS = -D_REENTRANT
+- INTERNAL_OBJCFLAGS = -D_REENTRANT
++ INTERNAL_CFLAGS = -D_REENTRANT -D_THREAD_SAFE
++ INTERNAL_OBJCFLAGS = -D_REENTRANT -D_THREAD_SAFE
+ AUXILIARY_OBJC_LIBS += $(objc_threaded)
+ ifeq ($(shared), no)
+ TARGET_SYSTEM_LIBS += $(objc_threaded)
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index 4ac250385208..9ad9ae505474 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -1,3 +1,5 @@
+%%GNUSTEP_DEVEL%%@exec mkdir -p %D/System/Library/Makefiles
+%%GNUSTEP_DEVEL%%@exec ln -s Library/Makefiles %D/System
System/Makefiles/GNUstep-reset.sh
System/Makefiles/GNUstep.csh
System/Makefiles/GNUstep.sh
@@ -76,9 +78,9 @@ System/Makefiles/framework.make
System/Makefiles/gswapp.make
System/Makefiles/gswbundle.make
System/Makefiles/install-sh
-System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%/config.make
-System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%/user_home
-System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%/which_lib
+System/Makefiles/%%NOFLAT2%%config.make
+System/Makefiles/%%NOFLAT2%%user_home
+System/Makefiles/%%NOFLAT2%%which_lib
System/Makefiles/java-executable.template
System/Makefiles/java-tool.make
System/Makefiles/java.make
@@ -116,7 +118,7 @@ System/share/config.site
@dirrm System/Tools/Resources
@dirrm System/Tools/Java
@dirrm System/Tools
-@dirrm System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm System/Makefiles/%%GNU_ARCH%%/%%OPSYS%%
@dirrm System/Makefiles/%%GNU_ARCH%%
@dirrm System/Makefiles/Master
@dirrm System/Makefiles/Instance/Shared
@@ -124,7 +126,9 @@ System/share/config.site
@dirrm System/Makefiles/Instance
@dirrm System/Makefiles/Auxiliary
@dirrm System/Makefiles/Additional
-@dirrm System/Makefiles
+%%GNUSTEP_STABLE%%@dirrm System/Makefiles
+%%GNUSTEP_DEVEL%%@unexec rm -f %D/System/Makefiles
+%%GNUSTEP_DEVEL%%@dirrm System/Library/Makefiles
%%GNUSTEP_DEVEL%%@dirrm System/Library/Sounds
@dirrm System/Library/Services
@dirrm System/Library/PostScript
@@ -174,6 +178,7 @@ System/share/config.site
%%GNUSTEP_DEVEL%%@exec mkdir -p %D/System/Library/Images
%%GNUSTEP_DEVEL%%@exec mkdir -p %D/System/Library/KeyBindings
@exec mkdir -p %D/%%SYSTEMLIBRARY%%/Libraries/Java
+%%GNUSTEP_DEVEL%%@exec mkdir -p %D/System/Library/Makefiles/%%GNU_ARCH%%
@exec mkdir -p %D/%%SYSTEMLIBRARY%%/Libraries/Resources
@comment @exec mkdir -p %D/System/Library/Makefiles
@exec mkdir -p %D/System/Library/PostScript
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index f315e90979db..e940b9a35c1b 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.7.1
+PORTVERSION= 1.7.2
.else
PORTVERSION= 1.6.0
.endif
@@ -29,7 +29,6 @@ NO_MTREE= yes
NO_BUILD= yes
SYSTEMDIR= ${PREFIX}/System
SYSMAKEDIR= ${SYSTEMDIR}/Makefiles
-COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu
BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles
GNUSTEP_MAKE_PORT?= devel/gnustep-make
GNUSTEP_BASE_PORT?= lang/gnustep-base
@@ -44,13 +43,16 @@ GNU_ARCH= ix86
GNU_ARCH= ${MACHINE_ARCH}
.endif
+COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
.if defined(WITH_GNUSTEP_DEVEL)
-SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
+SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries
+COMBOLIBDIR= ${SYSLIBDIR}
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle
.else
SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
-.endif
-COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
+.endif
do-install: # empty
diff --git a/devel/gnustep/bsd.gnustep.mk b/devel/gnustep/bsd.gnustep.mk
index efbc987e1013..db3ffd5027fe 100644
--- a/devel/gnustep/bsd.gnustep.mk
+++ b/devel/gnustep/bsd.gnustep.mk
@@ -66,11 +66,12 @@ SYSTEMDIR= ${PREFIX}/System
SYSMAKEDIR= ${SYSTEMDIR}/Makefiles
COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
.if defined(WITH_GNUSTEP_DEVEL)
-SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
-COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries/${COMBOPATH}
-LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries/${COMBOPATH}
+SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries
+COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries
+LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries
PLIST_SUB+= SYSTEMLIBRARY="System/Library"
PLIST_SUB+= LOCALLIBRARY="Local/Library"
+PLIST_SUB+= NOFLAT=""
PLIST_SUB+= GNUSTEP_DEVEL=""
PLIST_SUB+= GNUSTEP_STABLE="@comment "
PKGNAMESUFFIX?= -devel
@@ -80,6 +81,7 @@ COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${COMBOPATH}
LOCALLIBDIR= ${PREFIX}/Local/Libraries/${COMBOPATH}
PLIST_SUB+= SYSTEMLIBRARY="System"
PLIST_SUB+= LOCALLIBRARY="Local"
+PLIST_SUB+= NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
PLIST_SUB+= GNUSTEP_DEVEL="@comment "
PLIST_SUB+= GNUSTEP_STABLE=""
.else
@@ -126,7 +128,11 @@ USE_GNUSTEP_XLIB=yes
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle
+.else
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
+.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=back
.endif
@@ -137,7 +143,11 @@ MAKE_FLAGS+= GUI_BACKEND_LIB=back
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-xdps.bundle
+.else
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-xdps.bundle/${COMBOPATH}
+.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=xdps
.endif
@@ -148,7 +158,11 @@ MAKE_FLAGS+= GUI_BACKEND_LIB=xdps
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-art.bundle
+.else
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-art.bundle/${COMBOPATH}
+.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=art
.endif
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 380ee37cd7bf..c20da4ac3b78 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-base
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.7.1
+PORTVERSION= 1.7.2
.else
PORTVERSION= 1.6.0
.endif
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index 4b1f632aaa92..5637bf6d9d6d 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,2 +1,2 @@
MD5 (gnustep-base-1.6.0.tar.gz) = 41d2b9d9ef7c86dfe5f4dba8fa501278
-MD5 (gnustep-base-1.7.1.tar.gz) = 84e102171fd9852e76473c6c661a93f6
+MD5 (gnustep-base-1.7.2.tar.gz) = bc1b74be8544ffe5fe4bf57a8df382c2
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 41a348e2c808..13e75ef26fc3 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -1,5 +1,5 @@
System/Library/Bundles/SSL.bundle/Resources/Info-gnustep.plist
-System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/SSL
+System/Library/Bundles/SSL.bundle/%%NOFLAT%%SSL
System/Library/Bundles/SSL.bundle/stamp.make
%%GNUSTEP_DEVEL%%System/Library/DTDs/gsdoc-0_6_5.dtd
%%GNUSTEP_DEVEL%%System/Library/DTDs/gsdoc-0_6_6.dtd
@@ -8,6 +8,7 @@ System/Library/Bundles/SSL.bundle/stamp.make
%%GNUSTEP_DEVEL%%System/Library/DTDs/plist-0_9.dtd
%%GNUSTEP_DEVEL%%System/Library/DocTemplates/AutoDocTemplate.gsdoc
%%GNUSTEP_DEVEL%%System/Library/DocTemplates/indextemplate.gsdoc
+%%GNUSTEP_DEVEL%%System/Library/Documentation/man/man1/gdnc.1.gz
%%GNUSTEP_DEVEL%%System/Library/Documentation/man/man8/gdomap.8.gz
%%SYSTEMLIBRARY%%/Headers/Foundation/Foundation.h
%%SYSTEMLIBRARY%%/Headers/Foundation/GSMime.h
@@ -82,6 +83,7 @@ System/Library/Bundles/SSL.bundle/stamp.make
%%GNUSTEP_STABLE%%System/Headers/Foundation/objc-load.h
%%SYSTEMLIBRARY%%/Headers/gnustep/base/DistributedObjects.h
%%SYSTEMLIBRARY%%/Headers/gnustep/base/GCObject.h
+%%GNUSTEP_DEVEL%%System/Library/Headers/gnustep/base/GNUstep.h
%%SYSTEMLIBRARY%%/Headers/gnustep/base/GSCategories.h
%%SYSTEMLIBRARY%%/Headers/gnustep/base/GSFileHandle.h
%%SYSTEMLIBRARY%%/Headers/gnustep/base/GSIArray.h
@@ -100,8 +102,10 @@ System/Library/Bundles/SSL.bundle/stamp.make
%%SYSTEMLIBRARY%%/Headers/gnustep/unicode/decomp.h
%%SYSTEMLIBRARY%%/Headers/gnustep/unicode/latin2.h
%%SYSTEMLIBRARY%%/Headers/gnustep/unicode/nextstep.h
-%%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%/%%OPSYS%%/GSConfig.h
-%%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%/%%OPSYS%%/mframe.h
+%%GNUSTEP_STABLE%%%%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%/%%OPSYS%%/GSConfig.h
+%%GNUSTEP_STABLE%%%%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%/%%OPSYS%%/mframe.h
+%%GNUSTEP_DEVEL%%%%SYSTEMLIBRARY%%/Headers/GSConfig.h
+%%GNUSTEP_DEVEL%%%%SYSTEMLIBRARY%%/Headers/mframe.h
%%GNUSTEP_DEVEL%%System/Library/Libraries/Resources/gnustep-base/English.lproj/Localizable.strings
%%GNUSTEP_DEVEL%%System/Library/Libraries/Resources/gnustep-base/French.lproj/Localizable.strings
%%GNUSTEP_DEVEL%%System/Library/Libraries/Resources/gnustep-base/German.lproj/Localizable.strings
@@ -1306,30 +1310,31 @@ System/Library/Bundles/SSL.bundle/stamp.make
%%GNUSTEP_STABLE%%System/Libraries/Resources/NSTimeZones/zones/W-SU
%%GNUSTEP_STABLE%%System/Libraries/Resources/NSTimeZones/zones/WET
%%GNUSTEP_STABLE%%System/Libraries/Resources/NSTimeZones/zones/Zulu
-%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgnustep-base.so
-%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgnustep-base.so.%%MAJORVERSION%%
-%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgnustep-base.so.%%VERSION%%
+%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgnustep-base.so
+%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgnustep-base.so.%%MAJORVERSION%%
+%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgnustep-base.so.%%VERSION%%
System/Makefiles/Additional/base.make
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gdomap
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/HTMLLinker
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/autogsdoc
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/cvtenc
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/defaults
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/gdnc
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/make_strings
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/pl2link
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/pldes
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/plmerge
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/plparse
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/plser
-System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/sfparse
-%%GNUSTEP_DEVEL%%System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/xmlparse
-@dirrm System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm System/Tools/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm System/Tools/%%GNU_ARCH%%
-@dirrm %%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm %%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm %%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gdomap
+%%GNUSTEP_STABLE%%System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/HTMLLinker
+System/Tools/%%NOFLAT%%autogsdoc
+System/Tools/%%NOFLAT%%cvtenc
+System/Tools/%%NOFLAT%%defaults
+System/Tools/%%NOFLAT%%gdnc
+%%GNUSTEP_DEVEL%%System/Tools/gdomap
+System/Tools/%%NOFLAT%%make_strings
+System/Tools/%%NOFLAT%%pl2link
+System/Tools/%%NOFLAT%%pldes
+System/Tools/%%NOFLAT%%plmerge
+System/Tools/%%NOFLAT%%plparse
+System/Tools/%%NOFLAT%%plser
+System/Tools/%%NOFLAT%%sfparse
+%%GNUSTEP_DEVEL%%System/Tools/xmlparse
+%%GNUSTEP_STABLE%%@dirrm System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm System/Tools/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm System/Tools/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm %%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm %%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm %%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%
%%GNUSTEP_DEVEL%%@dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/US
%%GNUSTEP_DEVEL%%@dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/SystemV
%%GNUSTEP_DEVEL%%@dirrm System/Library/Libraries/Resources/gnustep-base/NSTimeZones/zones/Pacific
@@ -1391,8 +1396,8 @@ System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/sfparse
%%GNUSTEP_STABLE%%@dirrm System/Libraries/Resources/English.lproj
%%GNUSTEP_STABLE%%@dirrm System/Libraries/Resources/DocTemplates
%%GNUSTEP_STABLE%%@dirrm System/Libraries/Resources/DTDs
-@dirrm %%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm %%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm %%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm %%SYSTEMLIBRARY%%/Headers/%%GNU_ARCH%%
@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/unicode
@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/base
@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep
@@ -1400,9 +1405,9 @@ System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/sfparse
%%GNUSTEP_DEVEL%%@dirrm System/Library/Documentation/man/man8
%%GNUSTEP_DEVEL%%@dirrm System/Library/Documentation/man/man1
%%GNUSTEP_DEVEL%%@dirrm System/Library/DTDs
-@dirrm System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SSL.bundle/%%GNU_ARCH%%
@dirrm System/Library/Bundles/SSL.bundle/Resources
@dirrm System/Library/Bundles/SSL.bundle
%%GNUSTEP_DEVEL%%@exec mkdir -p %D/System/Library/Documentation/man/man1