diff options
| author | Yoichi NAKAYAMA <yoichi@FreeBSD.org> | 2005-11-26 16:32:22 +0000 |
|---|---|---|
| committer | Yoichi NAKAYAMA <yoichi@FreeBSD.org> | 2005-11-26 16:32:22 +0000 |
| commit | a3969f9a8c08e1834c0d5391bd5ad2a0ad5c4353 (patch) | |
| tree | 11318ba198eebc6279da803d7c367ba359184a07 /editors/xemacs | |
| parent | - Update MASTER_SITES and WWW: line (diff) | |
Fix XEmacs working under amd64.
PR: ports/89559
Submitted by: Andrey Slusar
Notes
Notes:
svn path=/head/; revision=149583
Diffstat (limited to 'editors/xemacs')
| -rw-r--r-- | editors/xemacs/Makefile | 7 | ||||
| -rw-r--r-- | editors/xemacs/files/patch-Makefile.in.in | 11 | ||||
| -rw-r--r-- | editors/xemacs/pkg-plist | 1 |
3 files changed, 17 insertions, 2 deletions
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 26d7d5af1f29..aef559eeadd1 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -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 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \ # 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) @@ -135,6 +138,6 @@ 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 .include <bsd.port.post.mk> diff --git a/editors/xemacs/files/patch-Makefile.in.in b/editors/xemacs/files/patch-Makefile.in.in new file mode 100644 index 000000000000..7607097576f1 --- /dev/null +++ b/editors/xemacs/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/xemacs/pkg-plist b/editors/xemacs/pkg-plist index c3b5f768c61f..e29e9abfa4e3 100644 --- a/editors/xemacs/pkg-plist +++ b/editors/xemacs/pkg-plist @@ -8,6 +8,7 @@ bin/gnudoit 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 |