3 files changed, 58 insertions, 58 deletions

diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index b0dbfdcc8d98..bf33f3daa04a 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -77,13 +77,13 @@ Local/Applications/GNUMail.app/Resources/new-flag.tiff
 Local/Applications/GNUMail.app/Resources/pgp-mail.tiff
 Local/Applications/GNUMail.app/Resources/pgp-mail-small.tiff
 Local/Applications/GNUMail.app/Resources/up.tiff
-Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/GNUMail
-Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.openapp
+%%GNUSTEP_STABLE%%Local/Applications/GNUMail.app/%%NOFLAT%%GNUMail
+Local/Applications/GNUMail.app/%%NOFLAT%%library_paths.openapp
 Local/Applications/GNUMail.app/stamp.make
-%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so
-%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1
-%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1.0.0
-Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Clock
+%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGNUMail.so
+%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGNUMail.so.1
+%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGNUMail.so.1.0.0
+Local/Library/GNUMail/Clock.bundle/%%NOFLAT%%Clock
 Local/Library/GNUMail/Clock.bundle/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Clock.bundle/Resources/Date-0.tiff
 Local/Library/GNUMail/Clock.bundle/Resources/Date-1.tiff
@@ -132,95 +132,95 @@ Local/Library/GNUMail/Clock.bundle/Resources/Weekday.tiff
 Local/Library/GNUMail/Clock.bundle/stamp.make
 Local/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
-Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Compose
+Local/Library/GNUMail/Compose.prefs/%%NOFLAT%%Compose
 Local/Library/GNUMail/Compose.prefs/stamp.make
 Local/Library/GNUMail/Filtering.prefs/Resources/Filtering.tiff
 Local/Library/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
-Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Filtering
+Local/Library/GNUMail/Filtering.prefs/%%NOFLAT%%Filtering
 Local/Library/GNUMail/Filtering.prefs/stamp.make
 Local/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
-Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Fonts
+Local/Library/GNUMail/Fonts.prefs/%%NOFLAT%%Fonts
 Local/Library/GNUMail/Fonts.prefs/stamp.make
 Local/Library/GNUMail/Mailboxes.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Mailboxes.prefs/Resources/MailIcon_mailboxes.tiff
-Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Mailboxes
+Local/Library/GNUMail/Mailboxes.prefs/%%NOFLAT%%Mailboxes
 Local/Library/GNUMail/Mailboxes.prefs/stamp.make
 Local/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/MIME.prefs/Resources/mime.tiff
-Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/MIME
+Local/Library/GNUMail/MIME.prefs/%%NOFLAT%%MIME
 Local/Library/GNUMail/MIME.prefs/stamp.make
 Local/Library/GNUMail/Personal.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Personal.prefs/Resources/personal.tiff
-Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Personal
+Local/Library/GNUMail/Personal.prefs/%%NOFLAT%%Personal
 Local/Library/GNUMail/Personal.prefs/stamp.make
 Local/Library/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
-Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Receiving
+Local/Library/GNUMail/Receiving.prefs/%%NOFLAT%%Receiving
 Local/Library/GNUMail/Receiving.prefs/stamp.make
 Local/Library/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
-Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Sending
+Local/Library/GNUMail/Sending.prefs/%%NOFLAT%%Sending
 Local/Library/GNUMail/Sending.prefs/stamp.make
 Local/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
-Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Viewing
+Local/Library/GNUMail/Viewing.prefs/%%NOFLAT%%Viewing
 Local/Library/GNUMail/Viewing.prefs/stamp.make
-@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Viewing.prefs/Resources
 @dirrm Local/Library/GNUMail/Viewing.prefs
-@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Sending.prefs/Resources
 @dirrm Local/Library/GNUMail/Sending.prefs
-@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Receiving.prefs/Resources
 @dirrm Local/Library/GNUMail/Receiving.prefs
-@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Personal.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Personal.prefs/Resources
 @dirrm Local/Library/GNUMail/Personal.prefs
-@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Mailboxes.prefs/%%GNU_ARCH%%/
 @dirrm Local/Library/GNUMail/Mailboxes.prefs/Resources
 @dirrm Local/Library/GNUMail/Mailboxes.prefs
-@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/MIME.prefs/Resources
 @dirrm Local/Library/GNUMail/MIME.prefs
-@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Fonts.prefs/Resources
 @dirrm Local/Library/GNUMail/Fonts.prefs
-@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Filtering.prefs/Resources
 @dirrm Local/Library/GNUMail/Filtering.prefs
-@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Compose.prefs/Resources
 @dirrm Local/Library/GNUMail/Compose.prefs
-@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Clock.bundle/Resources
 @dirrm Local/Library/GNUMail/Clock.bundle
 @dirrm Local/Library/GNUMail
 @dirrm Local/Library
-@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%
 @dirrm Local/Applications/GNUMail.app/Resources/Swedish.lproj
 @dirrm Local/Applications/GNUMail.app/Resources/Spanish.lproj
 @dirrm Local/Applications/GNUMail.app/Resources/German.lproj
diff --git a/mail/pantomime-ssl/pkg-plist b/mail/pantomime-ssl/pkg-plist
index efe1186bcf94..1c76913c38cc 100644
--- a/mail/pantomime-ssl/pkg-plist
+++ b/mail/pantomime-ssl/pkg-plist
@@ -1,9 +1,9 @@
 Local/Library/Pantomime/TCPSSLConnection.bundle/Resources/Info-gnustep.plist
-Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/TCPSSLConnection
+Local/Library/Pantomime/TCPSSLConnection.bundle/%%NOFLAT%%TCPSSLConnection
 Local/Library/Pantomime/TCPSSLConnection.bundle/stamp.make
-@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/Resources
 @dirrm Local/Library/Pantomime/TCPSSLConnection.bundle
 @dirrm Local/Library/Pantomime
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index 22fabef85f4d..01484b0a1164 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -59,12 +59,12 @@
 %%LOCALLIBRARY%%/Headers/Pantomime/elm_defs.h
 %%LOCALLIBRARY%%/Headers/Pantomime/elm_lib.h
 %%LOCALLIBRARY%%/Headers/Pantomime/parseaddrs.h
-%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libPantomime.so
-%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libPantomime.so.1
-%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libPantomime.so.1.0.0
-@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%
-@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%
+%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libPantomime.so
+%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libPantomime.so.1
+%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libPantomime.so.1.0.0
+%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%
+%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%
 @dirrm %%LOCALLIBRARY%%/Libraries
 @dirrm %%LOCALLIBRARY%%/Headers/Pantomime
 @dirrm %%LOCALLIBRARY%%/Headers