From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 9 02:40:24 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 913DC16A4CE for ; Wed, 9 Feb 2005 02:40:24 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B455343D46 for ; Wed, 9 Feb 2005 02:40:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j192eNDA075523 for ; Wed, 9 Feb 2005 02:40:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j192eNhX075522; Wed, 9 Feb 2005 02:40:23 GMT (envelope-from gnats) Resent-Date: Wed, 9 Feb 2005 02:40:23 GMT Resent-Message-Id: <200502090240.j192eNhX075522@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pawel Worach Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6F1516A4CE for ; Wed, 9 Feb 2005 02:38:22 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7331243D39 for ; Wed, 9 Feb 2005 02:38:22 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j192cM3I007619 for ; Wed, 9 Feb 2005 02:38:22 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j192cMQD007618; Wed, 9 Feb 2005 02:38:22 GMT (envelope-from nobody) Message-Id: <200502090238.j192cMQD007618@www.freebsd.org> Date: Wed, 9 Feb 2005 02:38:22 GMT From: Pawel Worach To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/77291: [PATCH] editors/xemacs: update to 21.4.17 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2005 02:40:24 -0000 >Number: 77291 >Category: ports >Synopsis: [PATCH] editors/xemacs: update to 21.4.17 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 09 02:40:23 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Pawel Worach >Release: 6.0-CURRENT >Organization: >Environment: FreeBSD zero 6.0-CURRENT FreeBSD 6.0-CURRENT >Description: - Update port to 21.4.17 "Jumbo Shrimp". - Sync up Motif selection algorithm with xemacs21-mule port. - Remove GTK support for now, it was commented out and it does not work well. - General Makefile cleanup The -mule port builds on sparc64 so this one likely does too but I can't verify that is works. If someone could test it that would be nice. Removed files: files/patch-ai files/patch-ak files/patch-freebsd.h Also partially takes care of ports/68826. >How-To-Repeat: >Fix: Index: Mk/bsd.emacs.mk =================================================================== RCS file: /export/ctm/cvs/ports/Mk/bsd.emacs.mk,v retrieving revision 1.37 diff -u -u -r1.37 bsd.emacs.mk --- Mk/bsd.emacs.mk 8 Feb 2005 17:04:33 -0000 1.37 +++ Mk/bsd.emacs.mk 9 Feb 2005 02:29:42 -0000 @@ -132,7 +132,7 @@ # XEmacs-21.x .elif (${EMACS_PORT_NAME} == "xemacs21") EMACS_NAME= xemacs -EMACS_VER= 21.4.16 +EMACS_VER= 21.4.17 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} Index: editors/xemacs/Makefile =================================================================== RCS file: /export/ctm/cvs/ports/editors/xemacs/Makefile,v retrieving revision 1.83 diff -u -u -r1.83 Makefile --- editors/xemacs/Makefile 25 Dec 2004 22:27:59 -0000 1.83 +++ editors/xemacs/Makefile 9 Feb 2005 02:29:42 -0000 @@ -16,23 +16,15 @@ MAINTAINER?= ports@FreeBSD.org COMMENT?= This port tracks the stable version of the XEmacs text editor +XEMACS_REL= 21.4 +XEMACS_VER= 21.4.17 +XEMACS_ARCH= ${CONFIGURE_TARGET} + NOT_FOR_ARCHS= sparc64 RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages -.if !defined(WITHOUT_X11) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ - compface.1:${PORTSDIR}/mail/faces -USE_XLIB= yes -USE_XPM= yes -.endif -USE_BZIP2= yes - -XEMACS_REL= 21.4 -XEMACS_VER= 21.4.16 -XEMACS_ARCH= ${CONFIGURE_TARGET} +USE_BZIP2= yes STRIP= USE_AUTOCONF_VER=213 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd @@ -44,7 +36,8 @@ --with-ldap=no \ --with-site-lisp \ --with-database=berkdb \ - ${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX} ${WITH_GTK} + ${WITH_SCROLLBARS} ${WITH_DIALOGS} ${WITH_WIDGETS} \ + ${WITH_XFACE} ${WITH_OFFIX} MAKE_ARGS= prefix=${PREFIX} MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 @@ -56,86 +49,72 @@ # Undump and malloc do not behave on amd64 at the moment .if ${ARCH} == amd64 -CONFIGURE_ARGS+=--with-system-malloc --pdump +CONFIGURE_ARGS+= --with-system-malloc --pdump .endif -.if exists(${X11BASE}/lib/libXm.so) +.if !defined(WITHOUT_X11) +LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + tiff.4:${PORTSDIR}/graphics/tiff \ + compface.1:${PORTSDIR}/mail/faces +CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff +USE_XLIB= yes +USE_XPM= yes +.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC) USE_MOTIF= yes -HAVE_MOTIF= yes -.endif - -pre-fetch: -#.if !defined(WANT_GTK) -# @${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK " -# @${ECHO_MSG} "and recompile." -#.endif -.if defined(HAVE_MOTIF) -.if !defined(MOTIF_STATIC) - @${ECHO_MSG} "" - @${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally" - @${ECHO_MSG} "experience locked-up frames." - @${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, " - @${ECHO_MSG} "which will force the use of athena widgets for dialogs." +WITH_SCROLLBARS= --with-scrollbars=motif +WITH_DIALOGS= --with-dialogs=motif +WITH_WIDGETS= --with-widgets=motif +.else +WITH_SCROLLBARS= --with-scrollbars=athena +WITH_DIALOGS= --with-dialogs=athena +WITH_WIDGETS= --with-widgets=athena +.if defined(WITH_XAW3D) +LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d +CONFIGURE_ARGS+= --with-athena=3d .endif -.if !defined(WITHOUT_X11) - @${ECHO_MSG} "" - @${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you " - @${ECHO_MSG} "do not want to use X11." -CONFIG_ARGS+= --with-png=yes --with-tiff=yes .endif -.if defined(WITHOUT_X11) +.else CONFIGURE_ARGS+= --without-x11 .endif -# hack to avoid shipping binaries linked with Motif -.if defined(MOTIF_STATIC) -WITH_DIALOGS= --with-dialogs=athena +pre-patch: +.if !defined(WITHOUT_X11) +.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC) + @${ECHO_MSG} "" + @${ECHO_MSG} "If your MOTIF library is lesstif you might occasionally" + @${ECHO_MSG} "experience locked-up frames." + @${ECHO_MSG} "In this case, set the environment variable WITHOUT_MOTIF" + @${ECHO_MSG} "and recompile, which will force the use of athena for" + @${ECHO_MSG} "scrollbars, dialogs and widgets." .endif - -.if defined(WITH_XAW3D) -LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d + @${ECHO_MSG} "" + @${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you do not" + @${ECHO_MSG} "want to use X11." .endif -#.if defined(WANT_GTK) -#USE_GNOME= gtk20 -#MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" -#WITH_GTK= --with-gtk=yes \ -# --with-xpm=no -#USE_XPM= no -#.endif - # Drop faces (libcompface) and offix (libDnd) if building package, # autodetect otherwise .if defined(PACKAGE_BUILDING) WITH_XFACE?= --with-xface=no WITH_OFFIX?= --with-offix=no .endif -.endif - -post-patch: - @${RM} ${WRKSRC}/src/s/freebsd.h.orig # fix .so references in a few man pages pre-configure:: -.for file in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1 - @${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${file} > ${WRKDIR}/tmp_zot - @${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${file} +.for f in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1 + @${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${f} > ${WRKDIR}/tmp_zot + @${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${f} .endfor post-install:: -.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER} - ${STRIP_CMD} ${PREFIX}/bin/${file} +.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER} + ${STRIP_CMD} ${PREFIX}/bin/${f} .endfor # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp. # Do what PLIST does for pkg_add. ${MKDIR} ${PREFIX}/lib/xemacs/site-lisp ${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp ${RM} -f ${PREFIX}/bin/send-pr -#.if defined(WANT_GTK) -# @${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to" -# @${ECHO_MSG} "the maintainer." -# @${ECHO_MSG} "Please also be aware that the package's name was automagically changed" -# @${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}." -#.endif .include Index: editors/xemacs/distinfo =================================================================== RCS file: /export/ctm/cvs/ports/editors/xemacs/distinfo,v retrieving revision 1.25 diff -u -u -r1.25 distinfo --- editors/xemacs/distinfo 25 Dec 2004 22:27:59 -0000 1.25 +++ editors/xemacs/distinfo 9 Feb 2005 02:29:42 -0000 @@ -1,2 +1,2 @@ -MD5 (xemacs/xemacs-21.4.16.tar.bz2) = a3a5000db3ada076a117665ea473dab4 -SIZE (xemacs/xemacs-21.4.16.tar.bz2) = 9029850 +MD5 (xemacs/xemacs-21.4.17.tar.bz2) = a207e106138c085711160855d78b72a2 +SIZE (xemacs/xemacs-21.4.17.tar.bz2) = 8693211 Index: editors/xemacs/files/patch-ai =================================================================== RCS file: /export/ctm/cvs/ports/editors/xemacs/files/patch-ai,v retrieving revision 1.1 diff -u -u -r1.1 patch-ai --- editors/xemacs/files/patch-ai 23 Mar 1999 21:29:51 -0000 1.1 +++ editors/xemacs/files/patch-ai 9 Feb 2005 02:29:42 -0000 @@ -1,20 +0,0 @@ ---- lib-src/fakemail.c.orig Tue Mar 23 22:09:58 1999 -+++ lib-src/fakemail.c Tue Mar 23 22:12:20 1999 -@@ -157,9 +157,17 @@ - extern char *malloc (), *realloc (); - #endif - -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 -+#define CURRENT_USER -+#endif -+ - #ifdef CURRENT_USER - extern struct passwd *getpwuid (); -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 -+extern uid_t geteuid (); -+#else - extern unsigned short geteuid (); -+#endif - static struct passwd *my_entry; - #define cuserid(s) \ - (my_entry = getpwuid (((int) geteuid ())), \ Index: editors/xemacs/files/patch-ak =================================================================== RCS file: /export/ctm/cvs/ports/editors/xemacs/files/patch-ak,v retrieving revision 1.2 diff -u -u -r1.2 patch-ak --- editors/xemacs/files/patch-ak 25 Mar 2004 10:17:38 -0000 1.2 +++ editors/xemacs/files/patch-ak 9 Feb 2005 02:29:42 -0000 @@ -1,17 +0,0 @@ ---- ./src/unexelf.c~ Sun Aug 15 03:29:56 1999 -+++ ./src/unexelf.c Tue Nov 2 10:24:55 1999 -@@ -515,6 +515,14 @@ - # include - #endif - -+#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__)) -+# ifdef __STDC__ -+# define ElfW(type) Elf64_##type -+# else -+# define ElfW(type) Elf64_/**/type -+# endif -+#endif -+ - #if __GNU_LIBRARY__ - 0 >= 6 - # include /* get ElfW etc */ - #endif Index: editors/xemacs/files/patch-freebsd.h =================================================================== RCS file: /export/ctm/cvs/ports/editors/xemacs/files/patch-freebsd.h,v retrieving revision 1.1 diff -u -u -r1.1 patch-freebsd.h --- editors/xemacs/files/patch-freebsd.h 25 Dec 2004 22:27:59 -0000 1.1 +++ editors/xemacs/files/patch-freebsd.h 9 Feb 2005 02:29:42 -0000 @@ -1,11 +0,0 @@ ---- src/s/freebsd.h.orig Sun Nov 21 16:14:32 2004 -+++ src/s/freebsd.h Sun Nov 21 16:15:10 2004 -@@ -29,7 +29,7 @@ - #ifndef __FreeBSD_version - #include - #endif --#if __FreeBSD_version >= 199701 -+#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006 - #define LIBS_SYSTEM "-lutil -lxpg4" - #else - #define LIBS_SYSTEM "-lutil" >Release-Note: >Audit-Trail: >Unformatted: