Date: Sat, 26 Nov 2005 01:56:33 +0200 From: Andrey Slusar <anrays@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/89558: [MAINTAINER] editors/xemacs21-mule: fix work under amd64. Message-ID: <E1EfnQf-0000p8-P5@santinel.home.ua> Resent-Message-ID: <200511260000.jAQ00GsG059137@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1EfnQf-0000p8-P5>