ports/89559: [PATCH] editors/xemacs: fix work under amd64

[Andrey Slusar]

>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 at 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: