- avoid fixed pathname

- fix build with new gnustep-gui
- take maintainership
Approved by:	maintainer

5 files changed, 53 insertions, 6 deletions

diff --git a/editors/emacs.app/Makefile b/editors/emacs.app/Makefile
index edecfcefb292..ec292506e8a5 100644
--- a/editors/emacs.app/Makefile
+++ b/editors/emacs.app/Makefile
@@ -7,17 +7,15 @@
 
 PORTNAME=	emacs.app
 PORTVERSION=	9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	emacs-app
 DISTNAME=	emacs-23.0.0_NS-${PORTVERSION}pre3b
 
-MAINTAINER=	gurkan@phys.ethz.ch
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	The GNU Emacs editor on GNUstep
 
-BROKEN=		Does not compile
-
 USE_GNUSTEP=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
@@ -27,8 +25,11 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_MAKE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-CPPFLAGS+=	-I${PREFIX}/System/Library/Headers/
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" MAKE="${GMAKE}"
+CPPFLAGS+=	-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
+CFLAGS+=	-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
+LDFLAGS+=	-L${GNUSTEP_SYSTEM_ROOT}/Library/Libraries
+CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKE="${GMAKE}"
+CONFIGURE_ENV+=	GNUSTEP_SYSTEM_HEADERS="${GNUSTEP_SYSTEM_ROOT}/Library/Headers"
 BASEDIR=	${WRKSRC}/nextstep/build/Emacs.app
 CONFIGURE_ARGS+=	--without-gcc --with-ns --without-x --with-pop \
 		--prefix=${BASEDIR}/Resources --exec-prefix=${BASEDIR} --libexecdir=${BASEDIR}/libexec \
@@ -36,6 +37,7 @@ CONFIGURE_ARGS+=	--without-gcc --with-ns --without-x --with-pop \
 USE_GMAKE=	yes
 USE_MAKEFILE=	yes
 MAKE_ENV+=	MAKE="${GMAKE}" EMACSLOADPATH="${WRKSRC}/lisp:${WRKSRC}/leim"
+MAKE_ENV+=	GNUSTEP_SYSTEM_HEADERS="${GNUSTEP_SYSTEM_ROOT}/Library/Headers"
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|#define config_machfile "m/.h"|#define config_machfile "m/sparc.h"|g' ${WRKSRC}/src/config.h
diff --git a/editors/emacs.app/files/patch-emacs.c b/editors/emacs.app/files/patch-emacs.c
new file mode 100644
index 000000000000..0197adf8716e
--- /dev/null
+++ b/editors/emacs.app/files/patch-emacs.c
@@ -0,0 +1,11 @@
+--- src/emacs.c.orig	2006-09-20 04:29:27.000000000 +0200
++++ src/emacs.c	2008-03-23 18:38:20.000000000 +0100
+@@ -48,7 +48,7 @@
+ #endif
+ 
+ #ifdef GNUSTEP
+-#include <GSConfig.h>
++#include <GNUstepBase/GSConfig.h>
+ #endif
+ 
+ #include "lisp.h"
diff --git a/editors/emacs.app/files/patch-freebsd.h b/editors/emacs.app/files/patch-freebsd.h
new file mode 100644
index 000000000000..e75cb9b3af99
--- /dev/null
+++ b/editors/emacs.app/files/patch-freebsd.h
@@ -0,0 +1,12 @@
+--- src/s/freebsd.h.orig	Tue Aug 21 00:58:16 2007
++++ src/s/freebsd.h	Sun Sep 23 09:48:05 2007
+@@ -181,7 +181,9 @@
+    compiler seems to be modified to not find headers in
+    /usr/local/include or libs in /usr/local/lib by default.  */
+ 
++#ifndef HAVE_CONFIG_H
+ #define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/local/include -L/usr/local/lib
++#endif
+ 
+ /* Circumvent a bug in FreeBSD.  In the following sequence of
+    writes/reads on a PTY, read(2) returns bogus data:
diff --git a/editors/emacs.app/files/patch-prefix-args.c b/editors/emacs.app/files/patch-prefix-args.c
new file mode 100644
index 000000000000..1b9559232ee0
--- /dev/null
+++ b/editors/emacs.app/files/patch-prefix-args.c
@@ -0,0 +1,11 @@
+--- src/prefix-args.c.orig	2006-03-11 05:06:05.000000000 +0100
++++ src/prefix-args.c	2008-03-23 18:34:13.000000000 +0100
+@@ -45,6 +45,8 @@
+    I'm quitting and taking up gardening.  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include "GNUstepBase/GSConfig.h"
+ 
+ int
+ main (argc, argv)
diff --git a/editors/emacs.app/files/patch-src-Makefile.in b/editors/emacs.app/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..104723272167
--- /dev/null
+++ b/editors/emacs.app/files/patch-src-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2006-09-21 02:39:29.000000000 +0200
++++ src/Makefile.in	2008-04-29 20:24:21.000000000 +0200
+@@ -1051,7 +1051,7 @@
+    often contain options that have to do with using Emacs's crt0,
+    which are only good with temacs.  */
+ prefix-args${EXEEXT}: prefix-args.c $(config_h)
+-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
++	$(CC) $(ALL_CFLAGS) LD_SWITCH_SITE $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
+ 
+ /* Don't lose if this was not defined.  */
+ #ifndef OLDXMENU_OPTIONS