[Midnightbsd-cvs] mports [19424] trunk/deskutils: update prefs location

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 9 21:56:59 EDT 2015 

Revision: 19424
          http://svnweb.midnightbsd.org/mports/?rev=19424
Author:   laffer1
Date:     2015-06-09 21:56:58 -0400 (Tue, 09 Jun 2015)
Log Message:
-----------
update prefs location

Modified Paths:
--------------
    trunk/deskutils/Makefile
    trunk/deskutils/preferences/Makefile
    trunk/deskutils/preferences/distinfo
    trunk/deskutils/preferences/pkg-plist

Added Paths:
-----------
    trunk/deskutils/preferences/
    trunk/deskutils/preferences/files/patch-Keyboard.m
    trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile

Removed Paths:
-------------
    trunk/deskutils/preferences/files/patch-Modules__Keyboard__GNUmakefile
    trunk/deskutils/preferences.app/

Modified: trunk/deskutils/Makefile
===================================================================
--- trunk/deskutils/Makefile	2015-06-10 01:54:37 UTC (rev 19423)
+++ trunk/deskutils/Makefile	2015-06-10 01:56:58 UTC (rev 19424)
@@ -42,7 +42,7 @@
 SUBDIR += orage
 SUBDIR += planner
 SUBDIR += preferencepanes
-SUBDIR += preferences.app
+SUBDIR += preferences
 SUBDIR += strigi
 SUBDIR += strigiclient
 SUBDIR += strigidaemon

Modified: trunk/deskutils/preferences/Makefile
===================================================================
--- trunk/deskutils/preferences.app/Makefile	2015-06-02 11:59:34 UTC (rev 19310)
+++ trunk/deskutils/preferences/Makefile	2015-06-10 01:56:58 UTC (rev 19424)
@@ -6,9 +6,9 @@
 # $MidnightBSD$
 #
 
-PORTNAME=	preferences.app
+PORTNAME=	preferences
 PORTVERSION=	1.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	SF/prefsapp/prefsapp/${PORTVERSION}
 DISTNAME=	Preferences-${PORTVERSION}
@@ -15,26 +15,23 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GNUstep workspace manager
-LICENSE=	gpl2
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNUSTEP=	yes
-USE_GNUSTEP_BACK=	yes
-USE_GNUSTEP_BUILD=	yes
-USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-MAKEFILE=	GNUmakefile
+LICENSE_COMB=	multi
+LICENSE=	gpl2 lgpl2.1
 
+USES=		tar:bzip2 gnustep
+USE_GNUSTEP=	back build
+USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
+
+DEAFULT_LIBVERSION=	1.1.1
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 MODIFY=		GNUmakefile.preamble PrefsModule/GNUmakefile.preamble \
 		Modules/Keyboard/GNUmakefile.preamble \
 		Modules/PrefsApp/GNUmakefile.preamble
 
 post-patch:
-.for i in ${MODIFY}
-	@${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
-	@${SED} -e "s= -Werror==" ${WRKSRC}/${i}.sed > ${WRKSRC}/${i}
-	@${REINPLACE_CMD} -e 's/GNUSTEP_INSTALLATION_DIR=.*/GNUSTEP_INSTALLATION_DOMAIN=SYSTEM/' ${WRKSRC}/${i}
-.endfor
+	${REINPLACE_CMD} 's, -Werror,,' ${MODIFY:S,^,${WRKSRC}/,}
+	${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
+		${WRKSRC}/GNUmakefile.preamble
 
 .include <bsd.port.mk>

Modified: trunk/deskutils/preferences/distinfo
===================================================================
--- trunk/deskutils/preferences.app/distinfo	2015-06-02 11:59:34 UTC (rev 19310)
+++ trunk/deskutils/preferences/distinfo	2015-06-10 01:56:58 UTC (rev 19424)
@@ -1,4 +1,2 @@
-MD5 (Preferences-1.2.0.tar.bz2) = 1f08ecab990fd91a14fc40d369e5ed9a
 SHA256 (Preferences-1.2.0.tar.bz2) = f12a93b285e030fc7569d8ea62600d36e9bad69e63c49cc9897e3956590f3914
-RMD160 (Preferences-1.2.0.tar.bz2) = b94629b8a8d44cbbcf7c0a8bff775d89b6865bed
 SIZE (Preferences-1.2.0.tar.bz2) = 52293

Added: trunk/deskutils/preferences/files/patch-Keyboard.m
===================================================================
--- trunk/deskutils/preferences/files/patch-Keyboard.m	                        (rev 0)
+++ trunk/deskutils/preferences/files/patch-Keyboard.m	2015-06-10 01:56:58 UTC (rev 19424)
@@ -0,0 +1,10 @@
+--- Modules/Keyboard/Keyboard.m.orig	2002-06-08 10:29:36.000000000 +0200
++++ Modules/Keyboard/Keyboard.m	2010-05-22 11:24:43.000000000 +0200
+@@ -37,6 +37,7 @@
+ #import <AppKit/NSButton.h>
+ #import <AppKit/NSNibLoading.h>
+ #import <AppKit/NSOpenPanel.h>
++#import <Foundation/NSUserDefaults.h>
+ 
+ #import "Keyboard.h"
+ #import "KeyboardView.h"


Property changes on: trunk/deskutils/preferences/files/patch-Keyboard.m
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile (from rev 19310, trunk/deskutils/preferences.app/files/patch-Modules__Keyboard__GNUmakefile)
===================================================================
--- trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile	                        (rev 0)
+++ trunk/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile	2015-06-10 01:56:58 UTC (rev 19424)
@@ -0,0 +1,11 @@
+--- Modules/Keyboard/GNUmakefile.orig	2014-07-30 00:10:57.436168949 +0800
++++ Modules/Keyboard/GNUmakefile	2014-07-30 00:11:06.363171068 +0800
+@@ -3,7 +3,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
+ BUNDLE_NAME=		Keyboard
+ BUNDLE_EXTENSION=	.prefs
+ 
+-BUNDLE_INSTALL_DIR=	$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
++BUNDLE_INSTALL_DIR=	$(DESTDIR)$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
+ 
+ Keyboard_RESOURCE_FILES= \
+ 	Keyboard.gorm

Deleted: trunk/deskutils/preferences/files/patch-Modules__Keyboard__GNUmakefile
===================================================================
--- trunk/deskutils/preferences.app/files/patch-Modules__Keyboard__GNUmakefile	2015-06-02 11:59:34 UTC (rev 19310)
+++ trunk/deskutils/preferences/files/patch-Modules__Keyboard__GNUmakefile	2015-06-10 01:56:58 UTC (rev 19424)
@@ -1,11 +0,0 @@
---- ./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

Modified: trunk/deskutils/preferences/pkg-plist
===================================================================
--- trunk/deskutils/preferences.app/pkg-plist	2015-06-02 11:59:34 UTC (rev 19310)
+++ trunk/deskutils/preferences/pkg-plist	2015-06-10 01:56:58 UTC (rev 19424)
@@ -38,19 +38,3 @@
 GNUstep/System/Library/Preferences/Keyboard.prefs/Resources/Keyboard.gorm
 GNUstep/System/Library/Preferences/Keyboard.prefs/stamp.make
 GNUstep/System/Tools/Preferences
- at dirrm GNUstep/System/Library/Preferences/Keyboard.prefs/Resources
- at dirrm GNUstep/System/Library/Preferences/Keyboard.prefs
- at dirrm GNUstep/System/Library/Preferences
- at dirrm GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/Resources
- at dirrm GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%/Headers
- at dirrm GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions/%%MAJORLIBVERSION%%
- at dirrm GNUstep/System/Library/Frameworks/PrefsModule.framework/Versions
- at dirrm GNUstep/System/Library/Frameworks/PrefsModule.framework
- at dirrm GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
- at dirrm GNUstep/System/Applications/Preferences.app/Resources/PrefsApp.prefs
- at dirrm GNUstep/System/Applications/Preferences.app/Resources/English.lproj
- at dirrm GNUstep/System/Applications/Preferences.app/Resources
- at dirrm GNUstep/System/Applications/Preferences.app
- at dirrmtry Network/Library/Preferences
- at dirrmtry Network/Library
- at dirrmtry Network

More information about the Midnightbsd-cvs mailing list