GNUstep Update

- Update: gnustep-make-1.3.2
- remove obsolete MASTER_SITES

- Update: gnustep-objc-1.2.2

- Update: gnustep-base-1.3.2
- remove obsolete MASTER_SITES
- fix configure for libxml2
- more languages: Russian, Slovak, UkraineRussian

- Update: gnustep-guile-1.0.3.tar.gz

Not updated to: gnustep-gui-0.7.7,
it conflicts with gnustep-xgps-0.7.6

14 files changed, 44 insertions, 56 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index b949988..482ec83 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	gnustep-make
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/ \
-		http://ftp.codefactory.se/pub/gnu/gstep/ \
-		http://planetmirror.com/pub/gnustep/core/
+MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index c0952ed..bf6cd88 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1 +1 @@
-MD5 (gnustep-make-1.3.0.tar.gz) = 489c6e4252a4f68c6cc63a40b1d86427
+MD5 (gnustep-make-1.3.2.tar.gz) = 4e41f244bbbd7876d4e3efef4017ffd5
diff --git a/devel/gnustep-make/files/patch-GNUstep.sh.in b/devel/gnustep-make/files/patch-GNUstep.sh.in
deleted file mode 100644
index 8d58ff3..0000000
--- a/devel/gnustep-make/files/patch-GNUstep.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- GNUstep.sh.in~	Mon Mar 11 09:06:16 2002
-+++ GNUstep.sh.in	Wed Mar 20 15:58:45 2002
-@@ -136,14 +136,14 @@
- if [ "$convert_win_paths" = "yes" ]; then
-   # FIXME - G_U_R might not have been defined
-   gnustep_class_path="$G_U_R/Libraries/Java:$G_L_R/Libraries/Java:$G_N_R/Libraries/Java:$G_S_R/Libraries/Java"
-+  unset convert_win_paths
-+  unset G_U_R
-+  unset G_L_R
-+  unset G_N_R
-+  unset G_S_R
- else
-   gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
- fi
--unset convert_win_paths
--unset G_U_R
--unset G_L_R
--unset G_N_R
--unset G_S_R
- 
- if [ -z "$CLASSPATH" ]; then
-   CLASSPATH="$gnustep_class_path"
diff --git a/devel/gnustep-make/files/patch-ld_lib_path.sh b/devel/gnustep-make/files/patch-ld_lib_path.sh
deleted file mode 100644
index 361872a..0000000
--- a/devel/gnustep-make/files/patch-ld_lib_path.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ld_lib_path.sh~	Mon Feb  4 05:43:38 2002
-+++ ld_lib_path.sh	Wed Mar 20 16:00:00 2002
-@@ -50,6 +50,8 @@
-     additional="${additional}${dir}:"
-   done
-   unset dir
-+else
-+  additional=
- fi
- lib_paths="${additional}${lib_paths}"
- unset additional
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index a4e55a1..683468a 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -48,6 +48,7 @@ System/Makefiles/Master/test-tool.make
 System/Makefiles/Master/tool.make
 System/Makefiles/GNUstep.csh
 System/Makefiles/GNUstep.sh
+System/Makefiles/GNUstep-reset.sh
 System/Makefiles/aggregate.make
 System/Makefiles/application.make
 System/Makefiles/bundle.make
@@ -83,6 +84,7 @@ System/Makefiles/names.make
 System/Makefiles/objc.make
 System/Makefiles/os.sh
 System/Makefiles/palette.make
+System/Makefiles/relative_path.sh
 System/Makefiles/resource-set.make
 System/Makefiles/rules.make
 System/Makefiles/service.make
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 7ebd0a0..738fe25 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	gnustep-base
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 CATEGORIES=	lang devel
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/ \
-		http://ftp.codefactory.se/pub/gnu/gstep/ \
-		http://planetmirror.com/pub/gnustep/core/
+MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/core/
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -18,6 +16,8 @@ BUILD_DEPENDS=	${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/libobjc.so:${PORTSDIR}/lang/g
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/libobjc.so:${PORTSDIR}/lang/gnustep-objc
 
+BREAKS_IF_PEDANTIC=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 300000
@@ -34,6 +34,7 @@ USE_GMAKE=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+CFLAGS+=	-I${LOCALBASE}/include/libxml2/libxml
 
 .if ${MACHINE_ARCH} == "i386"
 GNU_ARCH=	ix86
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index adc65e1..31a2c4d 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1 +1 @@
-MD5 (gnustep-base-1.3.0.tar.gz) = 17ada29260cd7df0f00639c11ad0349b
+MD5 (gnustep-base-1.3.2.tar.gz) = 9a496baaf1014e4173e5efc4fc1720c7
diff --git a/lang/gnustep-base/files/patch-configure b/lang/gnustep-base/files/patch-configure
new file mode 100644
index 0000000..2097a7a
--- /dev/null
+++ b/lang/gnustep-base/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Thu Apr 18 18:02:10 2002
++++ configure	Sun Jun  2 20:16:07 2002
+@@ -5138,7 +5138,7 @@
+   if test x$xml_config_prefix != x ; then
+     xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
+     if test x${XML_CONFIG+set} != xset ; then
+-      XML_CONFIG=$xml_config_prefix/bin/xml-config
++      XML_CONFIG=$xml_config_prefix/bin/xml2-config
+     fi
+   fi
+ 
+@@ -5180,7 +5180,7 @@
+ 
+   if test "$XML2_CONFIG" = "no" ; then
+     # Extract the first word of "xml-config", so it can be a program name with args.
+-set dummy xml-config; ac_word=$2
++set dummy xml2-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:5186: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XML_CONFIG'+set}'`\" = set"; then
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index b75804d..d97f3aa 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -109,6 +109,9 @@ System/Libraries/Resources/Languages/French
 System/Libraries/Resources/Languages/German
 System/Libraries/Resources/Languages/Italian
 System/Libraries/Resources/Languages/Locale.aliases
+System/Libraries/Resources/Languages/Russian
+System/Libraries/Resources/Languages/Slovak
+System/Libraries/Resources/Languages/UkraineRussian
 System/Libraries/Resources/NSCharacterSets/README.CharSet
 System/Libraries/Resources/NSCharacterSets/alphanumericCharSet.dat
 System/Libraries/Resources/NSCharacterSets/controlCharSet.dat
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 5a55e2a..72899a3 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnustep-guile
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/libs/
 
diff --git a/lang/gnustep-guile/distinfo b/lang/gnustep-guile/distinfo
index 1524525..1532bff 100644
--- a/lang/gnustep-guile/distinfo
+++ b/lang/gnustep-guile/distinfo
@@ -1 +1 @@
-MD5 (gnustep-guile-1.0.1.tar.gz) = 77e0b76f016ac2e6fa9a4896002972d2
+MD5 (gnustep-guile-1.0.3.tar.gz) = 2107a7fdb29225329e6257448ac95371
diff --git a/lang/gnustep-guile/pkg-plist b/lang/gnustep-guile/pkg-plist
index b613b8c..f11ca09 100644
--- a/lang/gnustep-guile/pkg-plist
+++ b/lang/gnustep-guile/pkg-plist
@@ -1,5 +1,4 @@
 ../share/guile/1.4/ice-9/greg.scm
-../share/guile/1.4/languages/gstep-guile.scm
 System/Headers/ScriptKit/Guile.h
 System/Headers/ScriptKit/GuileInterpreter.h
 System/Headers/ScriptKit/GuileInvocation.h
@@ -9,17 +8,15 @@ System/Headers/ScriptKit/GuileScript.h
 System/Headers/ScriptKit/SKInterpreter.h
 System/Headers/ScriptKit/SKScript.h
 System/Headers/ScriptKit/ScriptKit.h
-System/Headers/libgstep_guile/gstep_guile.h
-System/Headers/libgstep_guile/gg_Object.h
+System/Headers/gnustep/guile/gstep_guile.h
+System/Headers/gnustep/guile/gg_Object.h
+System/Libraries/Guile/languages/gstep-guile.scm
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libScriptKit.so
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libScriptKit.so.1
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libScriptKit.so.1.0.0
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so.%%VERSION%%
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so.1
-System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_gui.so
-System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_gui.so.%%VERSION%%
-System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_gui.so.1
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so.%%VERSION%%
 System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so.1
@@ -33,8 +30,9 @@ lib/libgreg.a
 lib/libgreg.la
 lib/libgreg.so
 lib/libgreg.so.1
-@dirrm ../share/guile/1.4/languages/gstep-guile
-@dirrm ../share/guile/1.4/languages
+@dirrm System/Libraries/Guile/languages/gstep-guile
+@dirrm System/Libraries/Guile/languages
+@dirrm System/Libraries/Guile
 @dirrm System/Headers/ScriptKit
 @dirrm bin
 @dirrm lib
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index c036bee..253663c 100644
--- a/lang/gnustep-objc/Makefile
+++ b/lang/gnustep-objc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnustep-objc
-PORTVERSION=	1.2.0
-#PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/libs/
 
diff --git a/lang/gnustep-objc/distinfo b/lang/gnustep-objc/distinfo
index 5acd391..bbabffd 100644
--- a/lang/gnustep-objc/distinfo
+++ b/lang/gnustep-objc/distinfo
@@ -1 +1 @@
-MD5 (gnustep-objc-1.2.0.tar.gz) = 9b47d9a9b0dd6a693313ebd3c221293a
+MD5 (gnustep-objc-1.2.2.tar.gz) = e74e5daa58d88377f76d2b8a67ec8660