[26263] trunk/dports/gnustep

source_changes at macosforge.org source_changes at macosforge.org
Sun Jun 17 15:01:51 PDT 2007


Revision: 26263
          http://trac.macosforge.org/projects/macports/changeset/26263
Author:   yves at macports.org
Date:     2007-06-17 15:01:27 -0700 (Sun, 17 Jun 2007)

Log Message:
-----------
This is gnustep-make-2.0 and friends

Modified Paths:
--------------
    trunk/dports/gnustep/gnustep/Portfile
    trunk/dports/gnustep/gnustep/files/config-gnustep-user.sh
    trunk/dports/gnustep/gnustep-back/Portfile
    trunk/dports/gnustep/gnustep-base/Portfile
    trunk/dports/gnustep/gnustep-gui/Portfile
    trunk/dports/gnustep/gnustep-make/Portfile

Added Paths:
-----------
    trunk/dports/gnustep/gnustep-back/files/
    trunk/dports/gnustep/gnustep-back/files/patch-CairoFaceInfo.h
    trunk/dports/gnustep/gnustep-back/files/patch-Source-x11-XGServerWindow.m
    trunk/dports/gnustep/gnustep-back/files/patch-ftfont.m
    trunk/dports/gnustep/gnustep-core/
    trunk/dports/gnustep/gnustep-core/Portfile
    trunk/dports/gnustep/gnustep-gui/files/common_Folder.tiff
    trunk/dports/gnustep/gnustep-gui/files/common_HomeDirectory.tiff
    trunk/dports/gnustep/gnustep-gui/files/common_Root_PC.tiff
    trunk/dports/gnustep/gnustep-make/files/gnustep-1.0.tcl

Removed Paths:
-------------
    trunk/dports/gnustep/gnustep-base/files/
    trunk/dports/gnustep/gnustep-make/files/patch-latex.make
    trunk/dports/gnustep/gnustep-make/files/patch-palette.make
    trunk/dports/gnustep/gnustep-make/files/patch-target.make

Modified: trunk/dports/gnustep/gnustep/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep/Portfile	2007-06-17 21:53:18 UTC (rev 26262)
+++ trunk/dports/gnustep/gnustep/Portfile	2007-06-17 22:01:27 UTC (rev 26263)
@@ -4,19 +4,22 @@
 PortGroup   gnustep 1.0
 
 name        gnustep
-version     1.13.0
-revision    6
+version     0.18.1
+epoch       200706
 platforms   darwin
 maintainers yves at macports.org
 
 description  GNUstep meta port
 long_description \
-    ${description} \
-    Also provides a user-friendly environment config script
+    This is the GNUstep Desktop and Applications suite. \
+    Also provides a user-friendly environment configuration script.
 
-distfiles   ""
-build {}
-destroot {
+distfiles
+fetch       { }
+checksum    { }
+configure   { }
+build       { }
+destroot    {
     xinstall -d ${destroot}${prefix}/GNUstep/Local/Tools
     xinstall -m 755 ${filespath}/config-gnustep-user.sh \
         ${destroot}${prefix}/GNUstep/Local/Tools
@@ -29,23 +32,19 @@
         to set up  a nice GNUstep environment. \n"
 }
 
-depends_lib \
+depends_lib-append \
     port:ArtResources \
     port:GMastermind \
     port:GMines \
     port:GNUMail \
-    port:GPuzzle2 \
     port:PRICE \
     port:TalkSoup \
     port:Yap.app \
-    port:etoile \
     port:gworkspace \
     port:windowmaker
 
 variant devel {
     depends_lib-append \
-        port:ProjectCenter \
         port:ProjectManager \
-        port:Renaissance \
-        port:gnustep-dl2
+        port:Renaissance
 }

Modified: trunk/dports/gnustep/gnustep/files/config-gnustep-user.sh
===================================================================
--- trunk/dports/gnustep/gnustep/files/config-gnustep-user.sh	2007-06-17 21:53:18 UTC (rev 26262)
+++ trunk/dports/gnustep/gnustep/files/config-gnustep-user.sh	2007-06-17 22:01:27 UTC (rev 26263)
@@ -35,49 +35,6 @@
 echo
 echo
 
-echo 'You can enter your language name right now or '
-echo -n '"list" for a list of supported languages or "enter" to continue : '
-read
-gs_lang=${REPLY:-false}
-if [ $gs_lang = "list" ]
-	then
-	$t_clear
-	ls "$GNUSTEP_SYSTEM_ROOT/Library/Libraries/Resources/gnustep-base/Languages" | grep -v Locale
-	echo
-	echo -n 'you can enter a name right now or "enter" to continue : '
-	read
-	gs_lang=${REPLY:-false}
-fi
-if [ $gs_lang != false ]
-	then
-	$t_bold ; echo "GNUstep language = $gs_lang" ; $t_norm
-	echo
-	if [ -z $LANG ] && [ -d @PREFIX@/share/locale ]
-	   then
-	   echo
-	   echo 'You should also set your LANG environment before running this script'
-	   echo
-	   echo 'You can enter "list" for a hint and exit or "enter" to continue : '
-       read
-       sh_lang=${REPLY:-false}
-       if [ $sh_lang = "list" ]
-        then
-        $t_clear
-        echo "Language codes available for LANG :"
-        echo
-        ls @PREFIX@/share/locale
-        echo
-        echo "For example, you can set your LANG environment by adding"
-        echo "export LANG=fr"
-        echo "to your ~/.profile"
-        echo "if you use the French language"
-        echo
-        exit 1
-       fi
-    fi
-fi
-
-
 #
 # ask for timezone
 #
@@ -147,12 +104,6 @@
 	gdefaults write NSGlobalDomain "Local Time Zone" $zone
 fi
 
-if [ $gs_lang != false ]
-	then
-	sleep 2
-    echo "Language        : $gs_lang"
-	gdefaults write NSGlobalDomain Language $gs_lang
-fi
 sleep 2
 echo "XShm            : disabled"
 gdefaults write NSGlobalDomain XWindowBufferUseXShm NO
@@ -160,11 +111,14 @@
 sleep 2
 bundledir="$GNUSTEP_SYSTEM_ROOT/Library/Bundles"
 echo "Resetting GSAppKitUserBundles (in NSGlobalDomain)"
-gdefaults write NSGlobalDomain GSAppKitUserBundles "($bundledir/Camaelon.themeEngine, $bundledir/EtoileWildMenus)"
+defaults write NSGlobalDomain GSAppKitUserBundles "($bundledir/Camaelon.themeEngine, $bundledir/EtoileMenus.bundle, $bundledir/EtoileBehavior.bundle)"
 sleep 2
 echo "Setting User Interface Theme to Nesedah (in Camaelon domain)"
 gdefaults write Camaelon Theme Nesedah
 
+defaults write GWorkspace NoWarnOnQuit YES
+defaults write NSGlobalDomain GSWorkspaceApplication "NotExist.app"
+
 echo
 
 sleep 2

Modified: trunk/dports/gnustep/gnustep-back/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-back/Portfile	2007-06-17 21:53:18 UTC (rev 26262)
+++ trunk/dports/gnustep/gnustep-back/Portfile	2007-06-17 22:01:27 UTC (rev 26263)
@@ -1,10 +1,10 @@
 # $Id$
 
-PortSystem   1.0
+PortSystem  1.0
 PortGroup   gnustep 1.0
 
 name        gnustep-back
-version     0.11.0
+version     0.12.0
 platforms   darwin
 maintainers yves at macports.org
 
@@ -17,33 +17,49 @@
     which handles all of the display system dependent \
     such as specific calls to the X Window System.
 
-depends_lib   port:gnustep-gui port:libart_lgpl port:Xft2
+depends_lib     port:gnustep-gui \
+                port:libart_lgpl \
+                port:Xft2
 
-checksums     md5 fece87a22336e233b70e9ce999e1ea10 
+checksums       md5 1b0252a1b645dd2ca4c78427fb885f1f 
 
 use_configure   yes
-configure.args-append   --enable-graphics=art --disable-glitz
+configure.args  --enable-graphics=art \
+                --disable-glitz
+post-install {
+	ui_msg "
+	        In order to have a working GNUstep environment,
+	        copy these lines at the top of your ~/.xinitrc file :"
+	if {[file exists ${prefix}/GNUstep/System/Library/Makefiles/GNUstep.sh]} {
+	    ui_msg ". ${prefix}/GNUstep/System/Library/Makefiles/GNUstep.sh"
+	}
+    ui_msg "
+gdnc
+gpbs
+make_services
 
-post-install {
-	ui_msg "\n\
-	        In order to have a working GNUstep environment,\n\
-	        copy these lines at the top of your ~/.xinitrc file :\n\n\
-	        . ${prefix}/GNUstep/System/Library/Makefiles/GNUstep.sh\n\
-            gdnc \n\
-            gpbs \n\
-            make_services \n\n\
-            For more information on setting the GNUstep environment, see\n\
-            http://gnustep.made-it.com/BuildGuide/#CONFIG.GNUSTEP \n\n"
+            For more information on setting the GNUstep environment, see
+            http://gnustep.made-it.com/BuildGuide/#CONFIG.GNUSTEP"
 }
 
+platform macosx {
+    patchfiles-append   patch-ftfont.m \
+                        patch-CairoFaceInfo.h
+}
+
 platform darwin 8 {
-	configure.args-append  --disable-glx
+    configure.args-append   --disable-glx
 }
 
-# not tested
+# works better in quartz-wm
+variant quartzwm {
+    patchfiles-append patch-Source-x11-XGServerWindow.m
+}
+
+# experimental backend
 variant cairo {
-    depends_lib-delete  port:libart_lgpl
-    depends_lib-append  port:cairo port:glitz
-    configure.args-delete --enable-graphics=art --disable-glitz
-    configure.args-append --enable-graphics=cairo --enable-glitz
+    depends_lib-delete      port:libart_lgpl
+    depends_lib-append      port:cairo
+    configure.args-delete   --enable-graphics=art
+    configure.args-append   --enable-graphics=cairo
 }

Added: trunk/dports/gnustep/gnustep-back/files/patch-CairoFaceInfo.h
===================================================================
--- trunk/dports/gnustep/gnustep-back/files/patch-CairoFaceInfo.h	                        (rev 0)
+++ trunk/dports/gnustep/gnustep-back/files/patch-CairoFaceInfo.h	2007-06-17 22:01:27 UTC (rev 26263)
@@ -0,0 +1,12 @@
+--- Headers/cairo/CairoFaceInfo.h.orig	2007-06-17 17:20:29.000000000 -0400
++++ Headers/cairo/CairoFaceInfo.h	2007-06-17 17:21:46.000000000 -0400
+@@ -28,6 +28,9 @@
+ #include <Foundation/Foundation.h>
+ #include <ft2build.h>  
+ #include FT_FREETYPE_H
++#ifdef MAC_OS_X_VERSION_MAX_ALLOWED
++#undef MAC_OS_X_VERSION_MAX_ALLOWED
++#endif
+ #include <cairo-ft.h>
+ 
+ @interface CairoFaceInfo : NSObject

Added: trunk/dports/gnustep/gnustep-back/files/patch-Source-x11-XGServerWindow.m
===================================================================
--- trunk/dports/gnustep/gnustep-back/files/patch-Source-x11-XGServerWindow.m	                        (rev 0)
+++ trunk/dports/gnustep/gnustep-back/files/patch-Source-x11-XGServerWindow.m	2007-06-17 22:01:27 UTC (rev 26263)
@@ -0,0 +1,20 @@
+--- Source/x11/XGServerWindow.m.orig	2007-04-25 11:55:59.000000000 -0400
++++ Source/x11/XGServerWindow.m	2007-04-25 12:00:04.000000000 -0400
+@@ -2959,7 +2959,7 @@
+ 	      data[1] = generic.wintypes.win_menu_atom;
+ 	      len = 2;
+ #else
+-	      data[0] = generic.wintypes.win_menu_atom;
++	      data[0] = generic.wintypes.win_dock_atom;
+ 	      len = 1;
+ #endif
+ 	      skipTaskbar = YES;
+@@ -2978,7 +2978,7 @@
+ 	      data[1] = generic.wintypes.win_floating_atom;
+ 	      len = 2;
+ #else
+-	      data[0] = generic.wintypes.win_modal_atom;
++	      data[0] = generic.wintypes.win_dock_atom;
+ 	      len = 1;
+ #endif
+ 	      skipTaskbar = YES;

Added: trunk/dports/gnustep/gnustep-back/files/patch-ftfont.m
===================================================================
--- trunk/dports/gnustep/gnustep-back/files/patch-ftfont.m	                        (rev 0)
+++ trunk/dports/gnustep/gnustep-back/files/patch-ftfont.m	2007-06-17 22:01:27 UTC (rev 26263)
@@ -0,0 +1,13 @@
+--- Source/art/ftfont.m.orig	2007-04-29 13:50:37.000000000 -0400
++++ Source/art/ftfont.m	2007-04-29 13:50:46.000000000 -0400
+@@ -31,6 +31,10 @@
+ 
+ #else
+ 
++#ifdef	MAC_OS_X_VERSION_MAX_ALLOWED
++#undef	MAC_OS_X_VERSION_MAX_ALLOWED
++#endif
++
+
+ #include <math.h>
+ 

Modified: trunk/dports/gnustep/gnustep-base/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-base/Portfile	2007-06-17 21:53:18 UTC (rev 26262)
+++ trunk/dports/gnustep/gnustep-base/Portfile	2007-06-17 22:01:27 UTC (rev 26263)
@@ -1,11 +1,10 @@
 # $Id$
 
-PortSystem   1.0
+PortSystem 1.0
 PortGroup   gnustep 1.0
 
 name        gnustep-base
-version     1.13.1
-revision	1
+version     1.14.0
 platforms   darwin
 maintainers yves at macports.org
 
@@ -20,33 +19,35 @@
     It provides functionality that aims to implement the non-graphical \
     portion of the OpenStep standard (the Foundation library).
 
-checksums     md5 bdc92ab7048cd1ee8c18957b750686b5
-depends_lib   port:ffcall port:gnustep-make port:libxslt port:openssl
+checksums           md5 10a24a5568c5505c4b7480f170733d4d
 
+depends_lib         port:ffcall \
+                    port:gnustep-make \
+                    port:libxslt \
+                    port:openssl
+
+use_configure       yes
+
+destroot.keepdirs   ${destroot}${prefix}/var/run
+
 pre-extract {
-    if { 
-         [catch {set ilist [registry_installed ${name}]} result ] &&
-            [variant_isset with_docs]
+    if { [variant_isset with_docs] &&
+            [catch {set ilist [registry_installed ${name}]} result ]            
     } then {
-        ui_msg "\n\nWARNING\n\
-            gnustep-base documentation depends on gnustep-base ... \n\
+        ui_warn "
+            gnustep-base documentation depends on gnustep-base ...
             You must install gnustep-base before trying to install\
-            gnustep-base +with_docs\n\n"
+            gnustep-base +with_docs
+        "
         exit 1
     }
 }
 
-patchfiles	base.patch
 post-patch {
     reinplace "s|CODING-STANDARDS|GS-CODING-STANDARDS|g" \
         ${worksrcpath}/Documentation/GNUmakefile
 }
 
-use_configure   yes
-configure.args-append	LDFLAGS=-L${prefix}/lib
-
-destroot.keepdirs    ${destroot}${prefix}/var/run
-
 startupitem.create  yes
 startupitem.name	gdomap
 set my_pid          ${prefix}/var/run/gdomap.pid
@@ -60,18 +61,14 @@
     "kill -9 `cat ${my_pid}` && \\" \
     "rm -f ${my_pid}"
 
-platform powerpc {
-	variant with_ffi {
-    	configure.args-append \
-    		--enable-libffi \
-    		--with-ffi-include=${prefix}/include/gcc41 \
-            --with-ffi-library=${prefix}/lib/gcc41
-    }
+variant with_ffi {
+    configure.args-append \
+   	    --enable-libffi \
+   	    --with-ffi-include=${prefix}/include/gcc42 \
+        --with-ffi-library=${prefix}/lib/gcc42
 }
 
 platform darwin {
-    build.args-append    GUI_LIBS=""
-    
     post-destroot {
         cd ${destroot}${prefix}/GNUstep/System
         file rename Tools/defaults Tools/gdefaults
@@ -79,8 +76,9 @@
             Library/Documentation/man/man1/gdefaults.1.gz
     }
     post-install { 
-        ui_msg "\n\n\
+        ui_msg "
             **** GNUstep 'defaults' tool is renamed 'gdefaults' to avoid\
-            overriding Apple's defaults tool. *****\n\n"
+            overriding Apple's defaults tool. *****
+        "
     }
 }

Added: trunk/dports/gnustep/gnustep-core/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-core/Portfile	                        (rev 0)
+++ trunk/dports/gnustep/gnustep-core/Portfile	2007-06-17 22:01:27 UTC (rev 26263)
@@ -0,0 +1,32 @@
+# $Id$
+
+PortSystem  1.0
+PortGroup   gnustep 1.0
+
+name        gnustep-core
+version     0.18.1
+platforms   darwin
+maintainers yves at macports.org
+
+description  GNUstep core / Startup package
+long_description \
+    Startup is a compilation of the core GNUstep libraries. \
+    After installing GNUstep Startup, \
+    you will have a complete system for compiling and running \
+    GNUstep applications.
+    
+depends_lib port:gnustep-back
+
+distfiles
+fetch       { }
+checksum    { }
+configure   { }
+build       { }
+destroot    {
+	file mkdir ${destroot}${prefix}/GNUstep/system/Library/Documentation
+	system "echo ${long_description} > ${destroot}${prefix}/GNUstep/system/Library/Documentation/README.${name}.txt"
+}
+
+variant devel {
+    depends_lib-append  port:ProjectCenter
+}


Property changes on: trunk/dports/gnustep/gnustep-core/Portfile
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: trunk/dports/gnustep/gnustep-gui/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-gui/Portfile	2007-06-17 21:53:18 UTC (rev 26262)
+++ trunk/dports/gnustep/gnustep-gui/Portfile	2007-06-17 22:01:27 UTC (rev 26263)
@@ -1,14 +1,14 @@
 # $Id$
 
-PortSystem  1.0
-PortGroup   gnustep 1.0
+PortSystem      1.0
+PortGroup       gnustep 1.0
 
-name        gnustep-gui
-version     0.11.0
-platforms   darwin
-maintainers yves at macports.org
+name            gnustep-gui
+version         0.12.0
+platforms       darwin
+maintainers     yves at macports.org
 
-description  A library of graphical user interface Objective C classes
+description     A library of graphical user interface Objective C classes
 long_description \
     The GNUstep gui library is a library of graphical user interface classes \
     written completely in the Objective-C language. The classes are based \
@@ -17,24 +17,27 @@
     lists, browser lists, and windows. There are also many associated \
     classes for handling events, colors, fonts, pasteboards and images.
 
-checksums     md5 7821a516ce5f683885116d78ac09b79e
-depends_lib   port:aspell port:audiofile port:gnustep-base port:gnutls \
-              port:jpeg port:libpng port:libungif port:tiff
+checksums       md5 13f1ec9910a99105ed0f1f79f2ff2db0
 
-# fix for étoilé
-patchfiles    patch-GSToolbar.h patch-GSToolbar.m
+depends_lib     port:aspell \
+                port:audiofile \
+                port:gnustep-base \
+                port:gnutls \
+                port:libpng \
+                port:libungif \
+                port:tiff
 
 use_configure   yes
-configure.args-append \
-                --with-jpeg-library=${prefix}/lib \
-                --with-jpeg-include=${prefix}/include
 
+post-destroot {
+    system "cp -f ${filespath}/common_*.tiff \
+        ${destroot}${system_library}/Images"
+}
+
 platform darwin {
-    post-patch {
-        set chan [open ${worksrcpath}/TextConverters/RTF/GNUmakefile.preamble a]
-        puts $chan "RTFConverter_BUNDLE_LIBS += -lgnustep-gui"
-        close $chan
-    }


More information about the macports-changes mailing list