sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

editors/emacs20: remove conflict with other emacsen

Browse source 
This PR changes the installation directories of binaries
	and info files of editors/emacs20 port to its dedicated
	directories to remove conflict with other emacsen.

PR:		ports/89961
Submitted by:	NIIMI Satoshi <sa2c@sa2c.net>
This commit is contained in:
Edwin Groothuis 2005-12-12 21:12:52 +00:00
parent 6903d391b0
commit e9ac41b28e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=151054
2 changed files with 42 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editors/emacs20/Makefile
View file

@ -20,10 +20,6 @@ PATCH_DIST_STRIP= -p1
MAINTAINER?= ports@FreeBSD.org
COMMENT?= GNU editing macros
CONFLICTS= emacs-19.* emacs-21.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
ONLY_FOR_ARCHS= i386 alpha
DEPRECATED= "editors/emacs is recommended instead for new installations"
@ -38,10 +34,13 @@ CONFIGURE_ARGS= --with-x=no --with-pop
CONFIGURE_ARGS= --with-x-toolkit --with-pop
USE_XLIB= yes
.endif
CONFIGURE_ARGS+= --with-line-space
CONFIGURE_ARGS+= --with-line-space \
--bindir='$${archlibdir}' \
--infodir='$${datadir}/emacs/$${version}/info'
MAKE_ARGS+= manext=20.1
MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
MAN1= emacs.1 etags.1 ctags.1
MAN1= emacs20.1 etags20.1 ctags20.1
PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
RECOMPILE_ELS= dired.el startup.el
@ -61,4 +60,11 @@ post-build:
${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} ;\
)
BINDIR= ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
post-install:
for f in b2m ctags emacs emacsclient etags rcs-checkin; do \
${LN} -sf ${BINDIR}/$${f} ${PREFIX}/bin/$${f}20; \
done
${LN} -sf ${BINDIR}/emacs-${EMACS_VER} ${PREFIX}/bin/emacs-${EMACS_VER}
.include <bsd.port.mk>

81
editors/emacs20/pkg-plist
View file

@ -1,63 +1,25 @@
bin/b2m
bin/ctags
bin/emacs
bin/b2m20
bin/ctags20
bin/emacs-%%EMACS_VER%%
bin/emacsclient
bin/etags
bin/rcs-checkin
@unexec install-info --delete %D/info/ccmode %D/info/dir
@unexec install-info --delete %D/info/cl %D/info/dir
@unexec install-info --delete %D/info/dired-x %D/info/dir
@unexec install-info --delete %D/info/ediff %D/info/dir
@unexec install-info --delete %D/info/emacs %D/info/dir
@unexec install-info --delete %D/info/forms %D/info/dir
@unexec install-info --delete %D/info/gnus %D/info/dir
@unexec install-info --delete %D/info/info %D/info/dir
@unexec install-info --delete %D/info/message %D/info/dir
@unexec install-info --delete %D/info/mh-e %D/info/dir
@unexec install-info --delete %D/info/reftex %D/info/dir
@unexec install-info --delete %D/info/sc %D/info/dir
@unexec install-info --delete %D/info/vip %D/info/dir
@unexec install-info --delete %D/info/viper %D/info/dir
@unexec install-info --delete %D/info/widget %D/info/dir
info/ccmode
info/cl
info/dired-x
info/ediff
info/emacs
info/forms
info/gnus
info/info
info/message
info/mh-e
info/reftex
info/sc
info/vip
info/viper
info/widget
@exec install-info %D/info/ccmode %D/info/dir
@exec install-info %D/info/cl %D/info/dir
@exec install-info %D/info/dired-x %D/info/dir
@exec install-info %D/info/ediff %D/info/dir
@exec install-info %D/info/emacs %D/info/dir
@exec install-info %D/info/forms %D/info/dir
@exec install-info %D/info/gnus %D/info/dir
@exec install-info %D/info/info %D/info/dir
@exec install-info %D/info/message %D/info/dir
@exec install-info %D/info/mh-e %D/info/dir
@exec install-info %D/info/reftex %D/info/dir
@exec install-info %D/info/sc %D/info/dir
@exec install-info %D/info/vip %D/info/dir
@exec install-info %D/info/viper %D/info/dir
@exec install-info %D/info/widget %D/info/dir
bin/emacs20
bin/emacsclient20
bin/etags20
bin/rcs-checkin20
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/b2m
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/ctags
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/cvtmail
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacs
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacs-%%EMACS_VER%%
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacsclient
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacsserver
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/etags
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fakemail
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fns-%%EMACS_VER%%.1.el
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/hexl
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/movemail
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/profile
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/rcs-checkin
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/rcs2log
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/sorted-doc
libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
@ -152,6 +114,22 @@ share/emacs/%%EMACS_VER%%/etc/ulimit.hack
share/emacs/%%EMACS_VER%%/etc/vipcard.tex
share/emacs/%%EMACS_VER%%/etc/viperCard.tex
share/emacs/%%EMACS_VER%%/etc/yow.lines
share/emacs/%%EMACS_VER%%/info/ccmode
share/emacs/%%EMACS_VER%%/info/cl
share/emacs/%%EMACS_VER%%/info/dir
share/emacs/%%EMACS_VER%%/info/dired-x
share/emacs/%%EMACS_VER%%/info/ediff
share/emacs/%%EMACS_VER%%/info/emacs
share/emacs/%%EMACS_VER%%/info/forms
share/emacs/%%EMACS_VER%%/info/gnus
share/emacs/%%EMACS_VER%%/info/info
share/emacs/%%EMACS_VER%%/info/message
share/emacs/%%EMACS_VER%%/info/mh-e
share/emacs/%%EMACS_VER%%/info/reftex
share/emacs/%%EMACS_VER%%/info/sc
share/emacs/%%EMACS_VER%%/info/vip
share/emacs/%%EMACS_VER%%/info/viper
share/emacs/%%EMACS_VER%%/info/widget
@exec mkdir -p %D/share/emacs/%%EMACS_VER%%/leim
share/emacs/%%EMACS_VER%%/lisp/COPYING
share/emacs/%%EMACS_VER%%/lisp/README
@ -1308,6 +1286,7 @@ share/emacs/site-lisp/subdirs.el
@dirrm libexec/emacs
@dirrm share/emacs/%%EMACS_VER%%/etc/e
@dirrm share/emacs/%%EMACS_VER%%/etc
@dirrm share/emacs/%%EMACS_VER%%/info
@dirrm share/emacs/%%EMACS_VER%%/leim
@dirrm share/emacs/%%EMACS_VER%%/lisp/language
@dirrm share/emacs/%%EMACS_VER%%/lisp/gnus