aboutsummaryrefslogtreecommitdiff
path: root/lang/gnustep-guile
diff options
context:
space:
mode:
Diffstat (limited to 'lang/gnustep-guile')
-rw-r--r--lang/gnustep-guile/Makefile11
-rw-r--r--lang/gnustep-guile/distinfo2
-rw-r--r--lang/gnustep-guile/files/patch-Greg-configure11
-rw-r--r--lang/gnustep-guile/files/patch-configure11
-rw-r--r--lang/gnustep-guile/files/patch-link_base.m20
-rw-r--r--lang/gnustep-guile/pkg-plist62
6 files changed, 51 insertions, 66 deletions
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 71c8231b3002..3090e873d430 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnustep-guile
-PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTVERSION= 1.1.0
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNUSTEP} \
ftp://ftp.gnustep.org/pub/gnustep/%SUBDIR%/
@@ -26,6 +25,7 @@ USE_GMAKE= yes
MAKEFILE=
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
PLIST_SUB+= GUILE_VER="${GUILE_VER}"
+USE_REINPLACE= yes
MAN1= greg.1
@@ -47,4 +47,11 @@ USE_GNUSTEP_INSTALL= yes
GUILE_VER!= (cd ${PORTSDIR}/lang/guile && make -V GUILE_VER)
+pre-configure:
+ ${TOUCH} ${WRKSRC}/Greg/ac_nonexistent.h
+.if defined(WITH_GNUSTEP_DEVEL)
+ ${REINPLACE_CMD} -e 's=ROOT/Headers=ROOT/Library/Headers=g' \
+ ${WRKSRC}/configure
+.endif
+
.include <bsd.port.post.mk>
diff --git a/lang/gnustep-guile/distinfo b/lang/gnustep-guile/distinfo
index 1532bff44f18..4f1cf041be17 100644
--- a/lang/gnustep-guile/distinfo
+++ b/lang/gnustep-guile/distinfo
@@ -1 +1 @@
-MD5 (gnustep-guile-1.0.3.tar.gz) = 2107a7fdb29225329e6257448ac95371
+MD5 (gnustep-guile-1.1.0.tar.gz) = 8299f1dc2456f85b367a6f7d9e3af9d0
diff --git a/lang/gnustep-guile/files/patch-Greg-configure b/lang/gnustep-guile/files/patch-Greg-configure
deleted file mode 100644
index bbdcfc0e670c..000000000000
--- a/lang/gnustep-guile/files/patch-Greg-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- Greg/configure.orig Thu May 10 12:48:26 2001
-+++ Greg/configure Mon May 5 08:05:35 2003
-@@ -2259,7 +2259,7 @@
- done
-
-
--GUILE_LIB_PATH=`$GUILEPATH -c '(display (string-append (%package-data-dir) "/" (version)))'`
-+GUILE_LIB_PATH=`$GUILEPATH -c '(display (%library-dir))'`
-
- cat >> confdefs.h <<EOF
- #define GUILE_LIB_PATH $GUILE_LIB_PATH
diff --git a/lang/gnustep-guile/files/patch-configure b/lang/gnustep-guile/files/patch-configure
new file mode 100644
index 000000000000..ee323f88b014
--- /dev/null
+++ b/lang/gnustep-guile/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Thu Mar 27 11:03:26 2003
++++ configure Sat May 31 16:42:42 2003
+@@ -1149,7 +1149,7 @@
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++# *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ esac
+ fi
+ done
diff --git a/lang/gnustep-guile/files/patch-link_base.m b/lang/gnustep-guile/files/patch-link_base.m
deleted file mode 100644
index d04f34544cf3..000000000000
--- a/lang/gnustep-guile/files/patch-link_base.m
+++ /dev/null
@@ -1,20 +0,0 @@
---- Library/link_base.m.orig Tue Jul 31 05:02:34 2001
-+++ Library/link_base.m Mon Nov 25 06:16:58 2002
-@@ -77,7 +77,7 @@
- CSTR(NSDecimalSeparator);
- CSTR(NSDefaultRunLoopMode);
- CSTR(NSFileDeviceIdentifier);
-- CSTR(NSFileGroupOwnerAccountNumber);
-+ CSTR(NSFileGroupOwnerAccountID);
- CSTR(NSFileHandleConnectionAcceptedNotification);
- CSTR(NSFileHandleNotificationDataItem);
- CSTR(NSFileHandleNotificationFileHandleItem);
-@@ -85,7 +85,7 @@
- CSTR(NSFileHandleReadCompletionNotification);
- CSTR(NSFileHandleReadToEndOfFileCompletionNotification);
- CSTR(NSFileModificationDate);
-- CSTR(NSFileOwnerAccountNumber);
-+ CSTR(NSFileOwnerAccountID);
- CSTR(NSFilePosixPermissions);
- CSTR(NSFileReferenceCount);
- CSTR(NSFileSize);
diff --git a/lang/gnustep-guile/pkg-plist b/lang/gnustep-guile/pkg-plist
index e6230f4dec85..49643d9ecb32 100644
--- a/lang/gnustep-guile/pkg-plist
+++ b/lang/gnustep-guile/pkg-plist
@@ -10,34 +10,36 @@
%%USEX11%%System/Applications/gui.app/Resources/gui.desktop
%%USEX11%%System/Applications/gui.app/gui
%%USEX11%%System/Applications/gui.app/stamp.make
-System/Headers/ScriptKit/Guile.h
-System/Headers/ScriptKit/GuileInterpreter.h
-System/Headers/ScriptKit/GuileInvocation.h
-System/Headers/ScriptKit/GuileProcedure.h
-System/Headers/ScriptKit/GuileSCM.h
-System/Headers/ScriptKit/GuileScript.h
-System/Headers/ScriptKit/SKInterpreter.h
-System/Headers/ScriptKit/SKScript.h
-System/Headers/ScriptKit/ScriptKit.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
-%%USEX11%%System/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_gui.so.%%VERSION%%
-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
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/Guile.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileInterpreter.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileInvocation.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileProcedure.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileSCM.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileScript.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/SKInterpreter.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/SKScript.h
+%%SYSTEMLIBRARY%%/Headers/ScriptKit/ScriptKit.h
+%%SYSTEMLIBRARY%%/Headers/gnustep/guile/gstep_guile.h
+%%SYSTEMLIBRARY%%/Headers/gnustep/guile/gg_Object.h
+%%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile.scm
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libScriptKit.so
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libScriptKit.so.1
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libScriptKit.so.1.0.0
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so.%%VERSION%%
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_base.so.1
+%%USEX11%%%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgg_gui.so.%%VERSION%%
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so.%%VERSION%%
+%%SYSTEMLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgstep_guile.so.1
System/Makefiles/Additional/guile.make
System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/go
System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/guile-base
bin/greg
info/dir
+@comment @unexec install-info --delete %D/info/greg.info %D/info/dir
info/greg.info
+@exec install-info %D/info/greg.info %D/info/dir
lib/libgreg.a
lib/libgreg.la
lib/libgreg.so
@@ -52,15 +54,11 @@ lib/libgreg.so.1
%%USEX11%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%
%%USEX11%%@dirrm System/Applications/gui.app/Resources
%%USEX11%%@dirrm System/Applications/gui.app
-@dirrm System/Libraries/Guile/languages/gstep-guile
-@dirrm System/Libraries/Guile/languages
-@dirrm System/Libraries/Guile
-@dirrm System/Headers/gnustep/guile
-@dirrm System/Headers/ScriptKit
-@dirrm bin
-@dirrm lib
-@dirrm info
-@dirrm man/man1
-@dirrm man
+@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile
+@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile/languages
+@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile
+@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/guile
+@dirrm %%SYSTEMLIBRARY%%/Headers/ScriptKit
+@exec mkdir -p %D/%%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile
@cwd %%LOCALBASE%%
share/guile/%%GUILE_VER%%/ice-9/greg.scm