[Midnightbsd-cvs] CVS Commit: deskutils/preferences.app: Fake fixes.

[ctriv at midnightbsd.org]

Log Message:
-----------
Fake fixes.

Modified Files:
--------------
    mports/deskutils/preferences.app:
        Makefile (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

Added Files:
-----------
    mports/deskutils/preferences.app/files:
        patch-Modules__Keyboard__GNUmakefile (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/deskutils/preferences.app/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldeskutils/preferences.app/pkg-plist -Ldeskutils/preferences.app/pkg-plist -u -r1.1 -r1.2
--- deskutils/preferences.app/pkg-plist
+++ deskutils/preferences.app/pkg-plist
@@ -17,18 +17,17 @@
 System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
 System/Applications/Preferences.app/Resources/PrefsApp.prefs/PrefsApp
 System/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
-System/Applications/Preferences.app/library_paths.openapp
 System/Applications/Preferences.app/stamp.make
 System/Library/Libraries/libPrefsModule.so
 System/Library/Libraries/libPrefsModule.so.%%MAJORLIBVERSION%%
 System/Library/Libraries/libPrefsModule.so.%%LIBVERSION%%
 System/Library/Frameworks/PrefsModule.framework/Resources
-System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers/PrefsModule.h
-System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info-gnustep.plist
-System/Library/Frameworks/PrefsModule.framework/Versions/A/PrefsModule
-System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so
-System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.%%MAJORLIBVERSION%%
-System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.%%LIBVERSION%%
+System/Library/Frameworks/PrefsModule.framework/Versions/0/Headers/PrefsModule.h
+System/Library/Frameworks/PrefsModule.framework/Versions/0/Resources/Info-gnustep.plist
+System/Library/Frameworks/PrefsModule.framework/Versions/0/PrefsModule
+System/Library/Frameworks/PrefsModule.framework/Versions/0/libPrefsModule.so
+System/Library/Frameworks/PrefsModule.framework/Versions/0/libPrefsModule.so.%%MAJORLIBVERSION%%
+System/Library/Frameworks/PrefsModule.framework/Versions/0/libPrefsModule.so.%%LIBVERSION%%
 @exec ln -fs Versions/Current/Headers %D/System/Library/Frameworks/PrefsModule.framework/Headers
 @exec ln -fs Versions/Current/Resources %D/System/Library/Frameworks/PrefsModule.framework/Resources
 @exec ln -fs A %D/System/Library/Frameworks/PrefsModule.framework/Versions/Current
@@ -45,8 +44,8 @@
 @dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs
 @dirrm System/Applications/Preferences.app/Resources
 @dirrm System/Applications/Preferences.app
- at dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers
- at dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources
+ at dirrm System/Library/Frameworks/PrefsModule.framework/Versions/0/Headers
+ at dirrm System/Library/Frameworks/PrefsModule.framework/Versions/0/Resources
 @dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A
 @dirrm System/Library/Frameworks/PrefsModule.framework/Versions
 @dirrm System/Library/Frameworks/PrefsModule.framework
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/deskutils/preferences.app/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldeskutils/preferences.app/Makefile -Ldeskutils/preferences.app/Makefile -u -r1.1 -r1.2
--- deskutils/preferences.app/Makefile
+++ deskutils/preferences.app/Makefile
@@ -16,6 +16,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GNUstep workspace manager
+LICENSE=	gpl2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -25,8 +26,6 @@
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 MAKEFILE=	GNUmakefile
-LDCONFIG_DIRS=	${LOCALLIBDIR}
-INSTALLS_SHLIB=	yes
 
 MODIFY=		GNUmakefile.preamble PrefsModule/GNUmakefile.preamble \
 		Modules/Keyboard/GNUmakefile.preamble \
@@ -35,7 +34,8 @@
 post-patch:
 .for i in ${MODIFY}
 	@${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
-	${SED} -e "s= -Werror==" ${WRKSRC}/${i}.sed > ${WRKSRC}/${i}
+	@${SED} -e "s= -Werror==" ${WRKSRC}/${i}.sed > ${WRKSRC}/${i}
+	@${REINPLACE_CMD} -e 's/GNUSTEP_INSTALLATION_DIR=.*/GNUSTEP_INSTALLATION_DOMAIN=SYSTEM/' ${WRKSRC}/${i}
 .endfor
 
 .include <bsd.port.mk>
--- /dev/null
+++ deskutils/preferences.app/files/patch-Modules__Keyboard__GNUmakefile
@@ -0,0 +1,11 @@
+--- ./Modules/Keyboard/GNUmakefile.orig	Fri Aug  3 14:27:36 2007
++++ ./Modules/Keyboard/GNUmakefile	Fri Aug  3 14:28:05 2007
+@@ -3,7 +3,7 @@
+ BUNDLE_NAME=		Keyboard
+ BUNDLE_EXTENSION=	.prefs
+ 
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(GNUSTEP_LIBRARY)/Preferences
+ 
+ Keyboard_RESOURCE_FILES= \
+ 	Keyboard.gorm