Attachment #122006 for bug #165082

View | Details | Raw Unified | Return to bug 165082
Collapse All | Expand All





PORTNAME=	emacs
PORTVERSION=	${EMACS_VER}
PORTREVISION?=	6
PORTEPOCH=	2
CATEGORIES=	editors ipv6
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION}a

MAINTAINER=	ashish@FreeBSD.org
COMMENT=	GNU editing macros

		xemacs-[0-9]* xemacs-devel-[0-9]* \
		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*

EMACS_VER=	23.4
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_BZIP2=	yes

Lines 1-4 Link Here

(-)editors/emacs/distinfo (-2 / +2 lines)
1	SHA256 (emacs-23.3a.tar.bz2) = 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba	1	SHA256 (emacs-23.4.tar.bz2) = 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9
2	SIZE (emacs-23.3a.tar.bz2) = 38748283	2	SIZE (emacs-23.4.tar.bz2) = 38646508
3	SHA256 (emacs23.3canna-20110316.diff.gz) = 26cb4bdb88685641e23d3a27953db56e04712caf154963edcaea41f5a403c7d3	3	SHA256 (emacs23.3canna-20110316.diff.gz) = 26cb4bdb88685641e23d3a27953db56e04712caf154963edcaea41f5a403c7d3
4	SIZE (emacs23.3canna-20110316.diff.gz) = 33845	4	SIZE (emacs23.3canna-20110316.diff.gz) = 33845

Lines 7-13 Link Here

(-)editors/emacs-devel/Makefile (-3 / +2 lines)
7		7
8	PORTNAME= emacs	8	PORTNAME= emacs
9	PORTVERSION= ${EMACS_VER}.${EMACS_REV}	9	PORTVERSION= ${EMACS_VER}.${EMACS_REV}
10	PORTREVISION= 1
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= editors ipv6	11	CATEGORIES= editors ipv6
13	MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \	12	MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \
Lines 27-34 Link Here
27	xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \	26	xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
28	emacs-nox11-[0-9]*	27	emacs-nox11-[0-9]*
29		28
30	EMACS_VER= 24.0.90	29	EMACS_VER= 24.0.93
31	EMACS_REV= 106240	30	EMACS_REV= 107184
32	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
33	USE_GMAKE= yes	32	USE_GMAKE= yes
34	USE_NCURSES= yes	33	USE_NCURSES= yes

Lines 1-2 Link Here

(-)editors/emacs-devel/distinfo (-2 / +2 lines)
1	SHA256 (emacs-24.0.90.106240.tar.xz) = afcb6851402e2321599e260b95c1953d01525a65f897c1abd9c5bb1600af590d	1	SHA256 (emacs-24.0.93.107184.tar.xz) = c0a3aa11cc480abe61f7b64fcc4778654292751dd7aeb9a9ef8a0a0371ff4003
2	SIZE (emacs-24.0.90.106240.tar.xz) = 23337568	2	SIZE (emacs-24.0.93.107184.tar.xz) = 23514852





--- configure.in.orig
+++ configure.in
@@ -1169,39 +1169,10 @@
   AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
   AC_SUBST(LIBSOUND)
 

-  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
-  if test $HAVE_ALSA = yes; then
-    SAVE_CFLAGS="$CFLAGS"
-    SAVE_LIBS="$LIBS"
-    CFLAGS="$ALSA_CFLAGS $CFLAGS"
-    LIBS="$ALSA_LIBS $LIBS"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
-                    emacs_alsa_normal=yes,
-	            emacs_alsa_normal=no)

-    fi
-
-    CFLAGS="$SAVE_CFLAGS"
-    LIBS="$SAVE_LIBS"
-    LIBSOUND="$LIBSOUND $ALSA_LIBS"
-    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
-    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])

      case "$opsys" in
        dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
        gnu-linux|freebsd|netbsd)
@@ -1218,7 +1189,7 @@
   linux/version.h sys/systeminfo.h \
   stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
   sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \





--- src/sysdep.c.orig
+++ src/sysdep.c
@@ -37,6 +37,20 @@
 #include "sysselect.h"
 #include "blockinput.h"
 
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+/* machine/frame.h in Sparc has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */
+#ifdef __sparc__ 
+#define frame freebsd_sparc_frame
+#endif
+#include <sys/user.h>
+#ifdef __sparc__ 
+#undef frame
+#endif
+#include <sys/resource.h>
+#include <math.h>
+#endif
+
 #ifdef WINDOWSNT
 #define read sys_read
 #define write sys_write
@@ -2529,6 +2543,40 @@
   return proclist;
 }
 

 /* The WINDOWSNT implementation is in w32.c.
    The MSDOS implementation is in dosfns.c.  */
 #elif !defined (WINDOWSNT) && !defined (MSDOS)
@@ -3079,6 +3127,176 @@
   return attrs;
 }
 

Lines 100-106 Link Here

(-)Mk/bsd.emacs.mk (-2 / +2 lines)
100	# Emacs-23.x	100	# Emacs-23.x
101	.elif (${EMACS_PORT_NAME} == "emacs23")	101	.elif (${EMACS_PORT_NAME} == "emacs23")
102	EMACS_NAME= emacs	102	EMACS_NAME= emacs
103	EMACS_VER= 23.3	103	EMACS_VER= 23.4
104	EMACS_MAJOR_VER= 23	104	EMACS_MAJOR_VER= 23
105	EMACS_LIBDIR?= share/${EMACS_NAME}	105	EMACS_LIBDIR?= share/${EMACS_NAME}
106	EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}	106	EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
Lines 117-123 Link Here
117	# Emacs-24.x (development version)	117	# Emacs-24.x (development version)
118	.elif (${EMACS_PORT_NAME} == "emacs-devel")	118	.elif (${EMACS_PORT_NAME} == "emacs-devel")
119	EMACS_NAME= emacs	119	EMACS_NAME= emacs
120	EMACS_VER= 24.0.90	120	EMACS_VER= 24.0.93
121	EMACS_MAJOR_VER= 24	121	EMACS_MAJOR_VER= 24
122	EMACS_LIBDIR?= share/${EMACS_NAME}	122	EMACS_LIBDIR?= share/${EMACS_NAME}
123	EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}	123	EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}

Return to bug 165082

Lines 7-18 Link Here

(-)editors/emacs/Makefile (-3 / +1 lines)
7		7
8	PORTNAME= emacs	8	PORTNAME= emacs
9	PORTVERSION= ${EMACS_VER}	9	PORTVERSION= ${EMACS_VER}
10	PORTREVISION?= 6
11	PORTEPOCH= 2	10	PORTEPOCH= 2
12	CATEGORIES= editors ipv6	11	CATEGORIES= editors ipv6
13	MASTER_SITES= ${MASTER_SITE_GNU}	12	MASTER_SITES= ${MASTER_SITE_GNU}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
15	DISTNAME= ${PORTNAME}-${PORTVERSION}a
16		14
17	MAINTAINER= ashish@FreeBSD.org	15	MAINTAINER= ashish@FreeBSD.org
18	COMMENT= GNU editing macros	16	COMMENT= GNU editing macros
Lines 26-32 Link Here
26	xemacs-[0-9]* xemacs-devel-[0-9]* \	24	xemacs-[0-9]* xemacs-devel-[0-9]* \
27	xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*	25	xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
28		26
29	EMACS_VER= 23.3	27	EMACS_VER= 23.4
30	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
31	USE_GMAKE= yes	29	USE_GMAKE= yes
32	USE_BZIP2= yes	30	USE_BZIP2= yes

Lines 3-9 Link Here

(-)editors/emacs-devel/files/patch-configure.in (-5 / +5 lines)
3		3
4	--- configure.in.orig	4	--- configure.in.orig
5	+++ configure.in	5	+++ configure.in
6	@@ -1167,39 +1167,10 @@	6	@@ -1169,39 +1169,10 @@
7	AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)	7	AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
8	AC_SUBST(LIBSOUND)	8	AC_SUBST(LIBSOUND)
9		9
Lines 12-20 Link Here
12	- PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)	12	- PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
13	- if test $HAVE_ALSA = yes; then	13	- if test $HAVE_ALSA = yes; then
14	- SAVE_CFLAGS="$CFLAGS"	14	- SAVE_CFLAGS="$CFLAGS"
15	- SAVE_LDFLAGS="$LDFLAGS"	15	- SAVE_LIBS="$LIBS"
16	- CFLAGS="$ALSA_CFLAGS $CFLAGS"	16	- CFLAGS="$ALSA_CFLAGS $CFLAGS"
17	- LDFLAGS="$ALSA_LIBS $LDFLAGS"	17	- LIBS="$ALSA_LIBS $LIBS"
18	- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],	18	- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
19	- emacs_alsa_normal=yes,	19	- emacs_alsa_normal=yes,
20	- emacs_alsa_normal=no)	20	- emacs_alsa_normal=no)
Lines 30-36 Link Here
30	- fi	30	- fi
31	-	31	-
32	- CFLAGS="$SAVE_CFLAGS"	32	- CFLAGS="$SAVE_CFLAGS"
33	- LDFLAGS="$SAVE_LDFLAGS"	33	- LIBS="$SAVE_LIBS"
34	- LIBSOUND="$LIBSOUND $ALSA_LIBS"	34	- LIBSOUND="$LIBSOUND $ALSA_LIBS"
35	- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"	35	- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
36	- AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])	36	- AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
Lines 44-50 Link Here
44	case "$opsys" in	44	case "$opsys" in
45	dnl defined __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __linux__	45	dnl defined __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __linux__
46	gnu-linux\|freebsd\|netbsd)	46	gnu-linux\|freebsd\|netbsd)
47	@@ -1216,7 +1187,7 @@	47	@@ -1218,7 +1189,7 @@
48	linux/version.h sys/systeminfo.h \	48	linux/version.h sys/systeminfo.h \
49	stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \	49	stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
50	sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \	50	sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \

Lines 3-23 Link Here

(-)editors/emacs-devel/files/patch-src_sysdep.c (-4 / +11 lines)
3		3
4	--- src/sysdep.c.orig	4	--- src/sysdep.c.orig
5	+++ src/sysdep.c	5	+++ src/sysdep.c
6	@@ -37,6 +37,13 @@	6	@@ -37,6 +37,20 @@
7	#include "sysselect.h"	7	#include "sysselect.h"
8	#include "blockinput.h"	8	#include "blockinput.h"
9		9
10	+#ifdef __FreeBSD__	10	+#ifdef __FreeBSD__
11	+#include <sys/sysctl.h>	11	+#include <sys/sysctl.h>
		12	+/* machine/frame.h in Sparc has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */
		13	+#ifdef __sparc__
		14	+#define frame freebsd_sparc_frame
		15	+#endif
12	+#include <sys/user.h>	16	+#include <sys/user.h>
13	+#include <sys/resource.h> */	17	+#ifdef __sparc__
		18	+#undef frame
		19	+#endif
		20	+#include <sys/resource.h>
14	+#include <math.h>	21	+#include <math.h>
15	+#endif	22	+#endif
16	+	23	+
17	#ifdef WINDOWSNT	24	#ifdef WINDOWSNT
18	#define read sys_read	25	#define read sys_read
19	#define write sys_write	26	#define write sys_write
20	@@ -2529,6 +2536,40 @@	27	@@ -2529,6 +2543,40 @@
21	return proclist;	28	return proclist;
22	}	29	}
23		30
Lines 58-64 Link Here
58	/* The WINDOWSNT implementation is in w32.c.	65	/* The WINDOWSNT implementation is in w32.c.
59	The MSDOS implementation is in dosfns.c. */	66	The MSDOS implementation is in dosfns.c. */
60	#elif !defined (WINDOWSNT) && !defined (MSDOS)	67	#elif !defined (WINDOWSNT) && !defined (MSDOS)
61	@@ -3079,6 +3120,176 @@	68	@@ -3079,6 +3127,176 @@
62	return attrs;	69	return attrs;
63	}	70	}
64		71