summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoredwin <edwin@FreeBSD.org>2005-11-26 12:38:23 +0000
committeredwin <edwin@FreeBSD.org>2005-11-26 12:38:23 +0000
commitb427afe373f582eab043e138188f10888c2603af (patch)
tree89c553f0cf0d2890d08c1ca29e849576c705a867
parent5922b39c0b7191f9ca3f06582a4a5d26a5de81b3 (diff)
downloadFreeBSD-ports-b427afe373f582eab043e138188f10888c2603af.zip
FreeBSD-ports-b427afe373f582eab043e138188f10888c2603af.tar.gz
[MAINTAINER] editors/xemacs21-mule: fix work under amd64.
* Fix XEmacs working under amd64 PR: 89558 Submitted by: Andrey Slusar <anrays@gmail.com>
-rw-r--r--editors/xemacs21-mule/Makefile11
-rw-r--r--editors/xemacs21-mule/files/patch-Makefile.in.in11
-rw-r--r--editors/xemacs21-mule/pkg-plist1
-rw-r--r--editors/xemacs21-mule/pkg-plist.arch-dep1
4 files changed, 20 insertions, 4 deletions
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 1f9ff51..4bb494e 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -98,9 +98,12 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
.include <bsd.port.pre.mk>
# Undump and malloc do not behave on amd64 at the moment
-#.if ${ARCH} == "amd64"
-#CONFIGURE_ARGS+=--with-system-malloc --pdump
-#.endif
+.if ${ARCH} == "amd64"
+CONFIGURE_ARGS+=--with-system-malloc --pdump
+PLIST_SUB+= PDUMP=""
+.else
+PLIST_SUB+= PDUMP="@comment "
+.endif
pre-fetch:
.if !defined(WITH_GTK)
@@ -198,7 +201,7 @@ post-install::
# 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 --git a/editors/xemacs21-mule/files/patch-Makefile.in.in b/editors/xemacs21-mule/files/patch-Makefile.in.in
new file mode 100644
index 0000000..7607097
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-Makefile.in.in
@@ -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 --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index f89cdb4..d3f3dbf 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -37,6 +37,7 @@ bin/ootags
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 --git a/editors/xemacs21-mule/pkg-plist.arch-dep b/editors/xemacs21-mule/pkg-plist.arch-dep
index 58f2551..c2846c4 100644
--- a/editors/xemacs21-mule/pkg-plist.arch-dep
+++ b/editors/xemacs21-mule/pkg-plist.arch-dep
@@ -9,6 +9,7 @@ bin/ootags
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
OpenPOWER on IntegriCloud