From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 26 00:00:28 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 AD14E16A41F for ; Sat, 26 Nov 2005 00:00:28 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2A6343D69 for ; Sat, 26 Nov 2005 00:00:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAQ00Hjl059158 for ; Sat, 26 Nov 2005 00:00:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAQ00HUI059156; Sat, 26 Nov 2005 00:00:17 GMT (envelope-from gnats) Resent-Date: Sat, 26 Nov 2005 00:00:17 GMT Resent-Message-Id: <200511260000.jAQ00HUI059156@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, Andrey Slusar Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05DB616A41F for ; Fri, 25 Nov 2005 23:59:41 +0000 (GMT) (envelope-from vasallia@ukr.net) Received: from tor.farlep.net (tor.farlep.net [213.130.1.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EBFF43D62 for ; Fri, 25 Nov 2005 23:59:36 +0000 (GMT) (envelope-from vasallia@ukr.net) Received: from santinel.home.ua (990-29.dialup.farlep.net [213.130.7.159]) by tor.farlep.net with ESMTP id jAPNxS9g006040 for ; Sat, 26 Nov 2005 01:59:34 +0200 Received: from anray by santinel.home.ua with local (Exim 4.54; FreeBSD) id 1EfnTS-0000qS-DI for ; Sat, 26 Nov 2005 01:59:26 +0200 Message-Id: Date: Sat, 26 Nov 2005 01:59:26 +0200 From: Andrey Slusar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89559: [PATCH] editors/xemacs: fix work under amd64 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andrey Slusar List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Nov 2005 00:00:28 -0000 >Number: 89559 >Category: ports >Synopsis: [PATCH] editors/xemacs: fix work under amd64 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Nov 26 00:00:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrey Slusar >Release: FreeBSD 6.0-STABLE i386 >Organization: Santinel >Environment: System: FreeBSD santinel.home.ua 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Nov 19 02:13:17 EET 2005 anray@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386 >Description: New files: files/patch-Makefile.in.in * Fix XEmacs working under amd64. >How-To-Repeat: >Fix: --- xemacs.diff begins here --- diff -ruN /usr/ports/editors/xemacs/Makefile xemacs/Makefile --- /usr/ports/editors/xemacs/Makefile Sun Nov 20 01:25:05 2005 +++ xemacs/Makefile Fri Nov 25 11:01:14 2005 @@ -7,7 +7,7 @@ PORTNAME= xemacs PORTVERSION= ${XEMACS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -53,6 +53,9 @@ # Undump and malloc do not behave on amd64 at the moment .if ${ARCH} == amd64 CONFIGURE_ARGS+= --with-system-malloc --pdump +PLIST_SUB+= PDUMP="" +.else +PLIST_SUB+= PDUMP="@comment " .endif .if !defined(WITHOUT_XEMACS_PACKAGES) diff -ruN /usr/ports/editors/xemacs/files/patch-Makefile.in.in xemacs/files/patch-Makefile.in.in --- /usr/ports/editors/xemacs/files/patch-Makefile.in.in Thu Jan 1 03:00:00 1970 +++ xemacs/files/patch-Makefile.in.in Fri Nov 25 10:38:46 2005 @@ -0,0 +1,11 @@ +--- Makefile.in.in.orig Fri Nov 25 10:38:19 2005 ++++ Makefile.in.in Fri Nov 25 10:38:28 2005 +@@ -429,7 +429,7 @@ + do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ + else true; fi + #ifdef PDUMP +- ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp ++ ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}.dmp + #endif + #ifdef WIN32_NATIVE + ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} diff -ruN /usr/ports/editors/xemacs/pkg-plist xemacs/pkg-plist --- /usr/ports/editors/xemacs/pkg-plist Thu Jun 16 20:26:19 2005 +++ xemacs/pkg-plist Fri Nov 25 10:57:41 2005 @@ -8,6 +8,7 @@ bin/ootags bin/rcs-checkin bin/xemacs-%%XEMACS_VER%% +%%PDUMP%%bin/xemacs-%%XEMACS_VER%%.dmp @exec ln -s %D/%F %B/xemacs @unexec rm %B/xemacs @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp --- xemacs.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: