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 4023F16A41F 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 71C8F43D62 for ; Sat, 26 Nov 2005 00:00:16 +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 jAQ00GGP059139 for ; Sat, 26 Nov 2005 00:00:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAQ00GsG059137; Sat, 26 Nov 2005 00:00:16 GMT (envelope-from gnats) Resent-Date: Sat, 26 Nov 2005 00:00:16 GMT Resent-Message-Id: <200511260000.jAQ00GsG059137@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 44B7516A41F for ; Fri, 25 Nov 2005 23:56:42 +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 5E06143D5E for ; Fri, 25 Nov 2005 23:56:40 +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 jAPNuZ46006005 for ; Sat, 26 Nov 2005 01:56:36 +0200 Received: from anray by santinel.home.ua with local (Exim 4.54; FreeBSD) id 1EfnQf-0000p8-P5 for ; Sat, 26 Nov 2005 01:56:33 +0200 Message-Id: Date: Sat, 26 Nov 2005 01:56:33 +0200 From: Andrey Slusar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89558: [MAINTAINER] editors/xemacs21-mule: 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: 89558 >Category: ports >Synopsis: [MAINTAINER] editors/xemacs21-mule: fix work under amd64. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Nov 26 00:00:15 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: --- xemacs21-mule.diff begins here --- diff -ruN /usr/ports/editors/xemacs21-mule/Makefile xemacs21-mule/Makefile --- /usr/ports/editors/xemacs21-mule/Makefile Fri Nov 25 20:01:32 2005 +++ xemacs21-mule/Makefile Sat Nov 26 01:49:02 2005 @@ -7,6 +7,7 @@ PORTNAME= xemacs-mule PORTVERSION= ${XEMACS_VER} +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -99,6 +100,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 pre-fetch: @@ -197,7 +201,7 @@ # 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 ${PREFIX}/bin/xemacs-${XEMACS_VER}-*.dmp + ${RM} -f ${PREFIX}/bin/send-pr .if defined(WITH_GTK) @${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to" @${ECHO_MSG} "the maintainer." diff -ruN /usr/ports/editors/xemacs21-mule/files/patch-Makefile.in.in xemacs21-mule/files/patch-Makefile.in.in --- /usr/ports/editors/xemacs21-mule/files/patch-Makefile.in.in Thu Jan 1 03:00:00 1970 +++ xemacs21-mule/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/xemacs21-mule/pkg-plist xemacs21-mule/pkg-plist --- /usr/ports/editors/xemacs21-mule/pkg-plist Fri Nov 25 20:01:51 2005 +++ xemacs21-mule/pkg-plist Fri Nov 25 10:44:40 2005 @@ -37,6 +37,7 @@ bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% +%%PDUMP%%bin/xemacs-%%XEMACS_VER%%.dmp lib/xemacs-%%XEMACS_VER%%/etc/BETA lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS lib/xemacs-%%XEMACS_VER%%/etc/CODING-STANDARDS diff -ruN /usr/ports/editors/xemacs21-mule/pkg-plist.arch-dep xemacs21-mule/pkg-plist.arch-dep --- /usr/ports/editors/xemacs21-mule/pkg-plist.arch-dep Fri Nov 25 20:01:58 2005 +++ xemacs21-mule/pkg-plist.arch-dep Fri Nov 25 10:40:26 2005 @@ -9,6 +9,7 @@ bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% +%%PDUMP%%bin/xemacs-%%XEMACS_VER%%.dmp lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/DOC lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/add-big-package.sh lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/config.values --- xemacs21-mule.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: