ports/165082: [PATCH] exp-run required for updating bsd.emacs.mk for Emacs ports updates

Mon Feb 13 05:50:09 UTC 2012

>Number:         165082
>Category:       ports
>Synopsis:       [PATCH] exp-run required for updating bsd.emacs.mk for Emacs ports updates
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 13 05:50:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Ashish SHUKLA
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD chateau.d.if 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

I'm planning to update editors/emacs and editors/emacs-devel ports
which will require update of ${PORTSDIR}/Mk/bsd.emacs.mk, as they keep
their latest version numbers in ${PORTSDIR}/Mk/bsd.emacs.mk.

Before proceeding with the update, I would like to request an -exp run.

The diffs to be tested are attached in Fix section. Please let me know
if I missed anything.

Thanks
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/editors/emacs/Makefile editors/emacs/Makefile

--- /usr/ports/editors/emacs/Makefile	2011-10-30 03:47:12.000000000 +0530
+++ editors/emacs/Makefile	2012-02-05 16:06:08.445330667 +0530
@@ -7,12 +7,10 @@
 
 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 at FreeBSD.org
 COMMENT=	GNU editing macros
@@ -26,7 +24,7 @@
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
-EMACS_VER=	23.3
+EMACS_VER=	23.4
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
diff -urN /usr/ports/editors/emacs/distinfo editors/emacs/distinfo
--- /usr/ports/editors/emacs/distinfo	2011-08-28 03:49:55.000000000 +0530
+++ editors/emacs/distinfo	2012-02-06 15:54:59.136057324 +0530
@@ -1,4 +1,4 @@
-SHA256 (emacs-23.3a.tar.bz2) = 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
-SIZE (emacs-23.3a.tar.bz2) = 38748283
+SHA256 (emacs-23.4.tar.bz2) = 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9
+SIZE (emacs-23.4.tar.bz2) = 38646508
 SHA256 (emacs23.3canna-20110316.diff.gz) = 26cb4bdb88685641e23d3a27953db56e04712caf154963edcaea41f5a403c7d3
 SIZE (emacs23.3canna-20110316.diff.gz) = 33845
diff -urN /usr/ports/editors/emacs-devel/Makefile editors/emacs-devel/Makefile
--- /usr/ports/editors/emacs-devel/Makefile	2011-10-30 22:16:10.000000000 +0530
+++ editors/emacs-devel/Makefile	2012-02-08 14:56:48.660291000 +0530
@@ -7,7 +7,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -27,8 +26,8 @@
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
 		emacs-nox11-[0-9]*
 
-EMACS_VER=	24.0.90
-EMACS_REV=	106240
+EMACS_VER=	24.0.93
+EMACS_REV=	107184
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NCURSES=	yes
diff -urN /usr/ports/editors/emacs-devel/distinfo editors/emacs-devel/distinfo
--- /usr/ports/editors/emacs-devel/distinfo	2011-10-30 20:38:12.000000000 +0530
+++ editors/emacs-devel/distinfo	2012-02-08 14:56:51.550290000 +0530
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.0.90.106240.tar.xz) = afcb6851402e2321599e260b95c1953d01525a65f897c1abd9c5bb1600af590d
-SIZE (emacs-24.0.90.106240.tar.xz) = 23337568
+SHA256 (emacs-24.0.93.107184.tar.xz) = c0a3aa11cc480abe61f7b64fcc4778654292751dd7aeb9a9ef8a0a0371ff4003
+SIZE (emacs-24.0.93.107184.tar.xz) = 23514852
diff -urN /usr/ports/editors/emacs-devel/files/patch-configure.in editors/emacs-devel/files/patch-configure.in
--- /usr/ports/editors/emacs-devel/files/patch-configure.in	2011-10-30 20:38:13.000000000 +0530
+++ editors/emacs-devel/files/patch-configure.in	2012-02-08 17:08:57.781292000 +0530
@@ -3,7 +3,7 @@
 
 --- configure.in.orig
 +++ configure.in
-@@ -1167,39 +1167,10 @@
+@@ -1169,39 +1169,10 @@
    AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
    AC_SUBST(LIBSOUND)
  
@@ -12,9 +12,9 @@
 -  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
 -  if test $HAVE_ALSA = yes; then
 -    SAVE_CFLAGS="$CFLAGS"
--    SAVE_LDFLAGS="$LDFLAGS"
+-    SAVE_LIBS="$LIBS"
 -    CFLAGS="$ALSA_CFLAGS $CFLAGS"
--    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+-    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)
@@ -30,7 +30,7 @@
 -    fi
 -
 -    CFLAGS="$SAVE_CFLAGS"
--    LDFLAGS="$SAVE_LDFLAGS"
+-    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.])
@@ -44,7 +44,7 @@
       case "$opsys" in
         dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
         gnu-linux|freebsd|netbsd)
-@@ -1216,7 +1187,7 @@
+@@ -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 \
diff -urN /usr/ports/editors/emacs-devel/files/patch-src_sysdep.c editors/emacs-devel/files/patch-src_sysdep.c
--- /usr/ports/editors/emacs-devel/files/patch-src_sysdep.c	2011-10-30 20:38:13.000000000 +0530
+++ editors/emacs-devel/files/patch-src_sysdep.c	2012-02-13 10:30:03.173684541 +0530
@@ -3,21 +3,28 @@
 
 --- src/sysdep.c.orig
 +++ src/sysdep.c
-@@ -37,6 +37,13 @@
+@@ -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>
-+#include <sys/resource.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 +2536,40 @@
+@@ -2529,6 +2543,40 @@
    return proclist;
  }
  
@@ -58,7 +65,7 @@
  /* The WINDOWSNT implementation is in w32.c.
     The MSDOS implementation is in dosfns.c.  */
  #elif !defined (WINDOWSNT) && !defined (MSDOS)
-@@ -3079,6 +3120,176 @@
+@@ -3079,6 +3127,176 @@
    return attrs;
  }
  
--- /usr/ports/Mk/bsd.emacs.mk	2011-11-11 10:37:42.000000000 +0530
+++ Mk/bsd.emacs.mk	2012-02-08 17:46:01.670291682 +0530
@@ -100,7 +100,7 @@
 # Emacs-23.x
 .elif (${EMACS_PORT_NAME} == "emacs23")
 EMACS_NAME=		emacs
-EMACS_VER=		23.3
+EMACS_VER=		23.4
 EMACS_MAJOR_VER=	23
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
@@ -117,7 +117,7 @@
 # Emacs-24.x (development version)
 .elif (${EMACS_PORT_NAME} == "emacs-devel")
 EMACS_NAME=		emacs
-EMACS_VER=		24.0.90
+EMACS_VER=		24.0.93
 EMACS_MAJOR_VER=	24
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
>Release-Note:
>Audit-Trail:
>Unformatted:

