diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2006-01-28 02:11:35 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2006-01-28 02:11:35 +0000 |
| commit | b09666fc1e84f3c48ffd364896f780150a2cf5a9 (patch) | |
| tree | c998550baecf34be07870269231bbbcbca9ae8c8 | |
| parent | Peer-to-peer network applications. (diff) | |
- Fix possibility of "infinite make fork" when "Registering install for ..."
EMACS ports. [1]
- Allow building a port as root using an NFS-mounted /usr/ports if the
server maps root to a UID other than root. [2]
- Make 'BROKEN' and 'IGNORED' ports exit their "make install" with a fail
status rather than success. [3]
- Improve behavior when dealing with versioned dependencies. [4]
- Fix false positives in check-conflicts target. [5]
- Remove obsolete bzip2 code. [6]
- Add physical category net-p2p. [7]
- Don't fetch INDEXFILE if not necessary; respect FETCH_ENV. [8], [11]
- INDEX can now be moved outside of ports tree. [9]
- Add ghostscript-gpl. [10]
- Remove obsolete USE_MESA. [12]
- Force pkg_install tools from ports on FreeBSD 4.10 and older. [13]
- Document ALWAYS_KEEP_DISTFILES. [14]
- Remove USE_REINPLACE from bsd.port.mk USE_DOS2UNIX patch. [15]
PR: ports/37596 [1], ports/57259 [2], ports/63216 [3],
ports/89448 [4], ports/89710 [5], ports/88996 [6],
ports/89260 [7], ports/89363 [8], ports/89809 [9],
ports/89853 [10], ports/91086 [11], ports/91710 [12],
ports/91727 [13], ports/92111 [14], ports/92124 [15]
Submitted by: Jay Sachs <jay at eziba dot com> [1], sem [1, 3, 8, 12],
Andrew Heybey <ath at niksun dot com> [2], Jamie Jones
<jamie at thompson dot bishopston dot net>, tobez [4], Mark
Andrews <Mark_Andrews at isc dot org> [5], edwin [6, 11, 15],
pav [7, 13], Peter Jeremy <PeterJeremy at optushome dot com
dot au> [9], Ulrich Spoerlein <q at galgenberg dot net> [10],
netchild [11], erwin [14]
Reviewed by: kris, clement (partially)
Notes
Notes:
svn path=/head/; revision=154626
145 files changed, 208 insertions, 53 deletions
@@ -39,6 +39,7 @@ SUBDIR += multimedia SUBDIR += net SUBDIR += net-im SUBDIR += net-mgmt +SUBDIR += net-p2p SUBDIR += news SUBDIR += palm SUBDIR += polish @@ -67,14 +68,19 @@ PORTSTOP= yes .include <bsd.port.subdir.mk> index: - @rm -f ${.CURDIR}/${INDEXFILE} - @cd ${.CURDIR} && make ${.CURDIR}/${INDEXFILE} + @rm -f ${INDEXDIR}/${INDEXFILE} + @cd ${.CURDIR} && make ${INDEXDIR}/${INDEXFILE} -fetchindex: - @cd ${.CURDIR} && ${FETCHINDEX} ${MASTER_SITE_INDEX}/${INDEXFILE}.bz2 && bunzip2 -f ${INDEXFILE}.bz2 && chmod a+r ${INDEXFILE} +fetchindex: ${INDEXDIR}/{INDEXFILE}.bz2 + @bunzip2 < ${INDEXDIR}/${INDEXFILE}.bz2 > ${INDEXDIR}/${INDEXFILE} && \ + chmod a+r ${INDEXDIR}/${INDEXFILE} + +${INDEXDIR}/{INDEXFILE}.bz2: .PHONY + @${FETCHINDEX} -o ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 MASTER_SITE_INDEX?= http://www.FreeBSD.org/ports/ -FETCHINDEX?= fetch -am +SETENV?= /usr/bin/env +FETCHINDEX?= ${SETENV} ${FETCH_ENV} fetch -am INDEX_JOBS?= 2 .if !defined(INDEX_VERBOSE) @@ -85,7 +91,7 @@ INDEX_ECHO_MSG= echo 1>&2 INDEX_ECHO_1ST= echo .endif -${.CURDIR}/${INDEXFILE}: +${INDEXDIR}/${INDEXFILE}: @${INDEX_ECHO_1ST} "Generating ${INDEXFILE} - please wait.."; \ if [ "${INDEX_PRISTINE}" != "" ]; then \ export LOCALBASE=/nonexistentlocal; \ @@ -119,18 +125,18 @@ ${.CURDIR}/${INDEXFILE}: cat $${tmpdir}/${INDEXFILE}.desc.* | perl ${.CURDIR}/Tools/make_index | \ sed -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e 's./..g' | \ sort -t '|' +1 -2 | \ - sed -e 's../.g' > ${.CURDIR}/${INDEXFILE}.tmp; \ + sed -e 's../.g' > ${INDEXDIR}/${INDEXFILE}.tmp; \ if [ "${INDEX_PRISTINE}" != "" ]; then \ sed -e "s,$${LOCALBASE},/usr/local," -e "s,$${X11BASE},/usr/X11R6," \ - ${.CURDIR}/${INDEXFILE}.tmp > ${.CURDIR}/${INDEXFILE}; \ + ${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \ else \ - mv ${.CURDIR}/${INDEXFILE}.tmp ${.CURDIR}/${INDEXFILE}; \ + mv ${INDEXDIR}/${INDEXFILE}.tmp ${INDEXDIR}/${INDEXFILE}; \ fi; \ rm -rf $${tmpdir}; \ echo " Done." -print-index: ${.CURDIR}/${INDEXFILE} - @awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${.CURDIR}/${INDEXFILE} +print-index: ${INDEXDIR}/${INDEXFILE} + @awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${INDEXDIR}/${INDEXFILE} CVS?= cvs SUP?= cvsup diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6206f3dfd118..5b963d1a04fe 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -120,6 +120,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # ${MASTER_SITE_OVERRIDE}) # EXTRACT_ONLY - If set, a subset of ${DISTFILES} you want to # actually extract. +# ALWAYS_KEEP_DISTFILES - If set, the package building cluster will save the distfiles along +# with the packages. This may be required to comply with some +# licenses, e.g. GPL in some cases. +# Default: not set. # # (NOTE: by convention, the MAINTAINER entry (see above) should go here.) # @@ -348,6 +352,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Some installations may wish to override the default # to specify a version without X11 and/or localized # versions for their nationality. +# WITH_GHOSTSCRIPT_GPL +# - If set, this port uses the GPL version of the ghostscript +# software instead of the GNU version, which is used otherwise. # WITH_GHOSTSCRIPT_AFPL # - If set, this port uses the AFPL version of the ghostscript # software instead of the GNU version, which is used otherwise. @@ -364,7 +371,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_FREETYPE - If set, this port uses the freetype print libraries. # USE_GL - If set, this port uses libGL (not needed with XFree86 4.x # which already includes this functionality). -# USE_MESA - If set, this port uses libGL/libglut (deprecated). # USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XPM. # NO_OPENMOTIF - If set, this port uses a custom Motif toolkit # instead of Openmotif. @@ -992,14 +998,8 @@ NOPRECIOUSSOFTMAKEVARS= yes AWK?= /usr/bin/awk BASENAME?= /usr/bin/basename BRANDELF?= /usr/bin/brandelf -.if exists(/usr/bin/bzip2) BZCAT?= /usr/bin/bzcat BZIP2_CMD?= /usr/bin/bzip2 -.else -BZCAT?= ${LOCALBASE}/bin/bzcat -BZIP2_CMD?= ${LOCALBASE}/bin/bzip2 -BZIP2DEPENDS= yes -.endif CAT?= /bin/cat CHGRP?= /usr/bin/chgrp CHMOD?= /bin/chmod @@ -1224,6 +1224,7 @@ X11BASE?= ${DESTDIR}/usr/X11R6 LINUXBASE?= ${DESTDIR}/compat/linux DISTDIR?= ${PORTSDIR}/distfiles _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} +INDEXDIR?= ${PORTSDIR} .if ${OSVERSION} >= 500036 INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} .else @@ -1350,7 +1351,7 @@ PERL= ${LOCALBASE}/bin/perl .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif -.if defined(EMACS_PORT_NAME) +.if defined(USE_EMACS) || defined(EMACS_PORT_NAME) .include "${PORTSDIR}/Mk/bsd.emacs.mk" .endif @@ -1491,17 +1492,11 @@ MANCOMPRESSED?= no .endif .if defined(PATCHFILES) -.if ${PATCHFILES:M*.bz2}x != x && defined(BZIP2DEPENDS) -PATCH_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 -.endif .if ${PATCHFILES:M*.zip}x != x PATCH_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif .endif -.if defined(USE_BZIP2) && defined(BZIP2DEPENDS) -EXTRACT_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 -.endif .if defined(USE_ZIP) EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif @@ -1510,10 +1505,6 @@ BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake CONFIGURE_ENV+= MAKE=${GMAKE} .endif -.if defined(USE_DOS2UNIX) -USE_REINPLACE= yes -.endif - .if defined(USE_GCC) .include "${PORTSDIR}/Mk/bsd.gcc.mk" .endif @@ -1743,10 +1734,6 @@ PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' PLIST_SUB+= XAWVER=${XAWVER} -.if defined(USE_MESA) -LIB_DEPENDS+= glut.3:${PORTSDIR}/graphics/libglut -.endif - .if defined(USE_BISON) BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison .endif @@ -1859,21 +1846,17 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include # compatible functionality. .if !defined(WITHOUT_X11) .if defined(WITH_GHOSTSCRIPT_AFPL) -.if ${WITH_GHOSTSCRIPT_AFPL} == yes GHOSTSCRIPT_PORT?= print/ghostscript-afpl -.else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu -.endif +.elif defined(WITH_GHOSTSCRIPT_GPL) +GHOSTSCRIPT_PORT?= print/ghostscript-gpl .else GHOSTSCRIPT_PORT?= print/ghostscript-gnu .endif .else .if defined(WITH_GHOSTSCRIPT_AFPL) -.if ${WITH_GHOSTSCRIPT_AFPL} == yes GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11 -.else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 -.endif +.elif defined(WITH_GHOSTSCRIPT_GPL) +GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11 .else GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 .endif @@ -2008,7 +1991,11 @@ EXTRACT_BEFORE_ARGS?= -qo EXTRACT_AFTER_ARGS?= -d ${WRKDIR} .else EXTRACT_BEFORE_ARGS?= -dc +.if defined(EXTRACT_PRESERVE_OWNERSHIP) +EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --no-same-owner +.else EXTRACT_AFTER_ARGS?= | ${TAR} -xf - +.endif .if defined(USE_BZIP2) EXTRACT_CMD?= ${BZIP2_CMD} .else @@ -2089,7 +2076,11 @@ _PORTDIRNAME= ${.CURDIR:T} PORTDIRNAME?= ${_PORTDIRNAME} PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} -.if exists(${LOCALBASE}/sbin/pkg_info) + +.if (${OSVERSION} < 491101 && ${PKGORIGIN} != "sysutils/pkg_install") || exists(${LOCALBASE}/sbin/pkg_info) +.if ${OSVERSION} < 491101 && ${PKGORIGIN} != "sysutils/pkg_install" +EXTRACT_DEPENDS+= ${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/sysutils/pkg_install +.endif PKG_CMD?= ${LOCALBASE}/sbin/pkg_create PKG_ADD?= ${LOCALBASE}/sbin/pkg_add PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete @@ -2581,7 +2572,7 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \ deskutils devel dns editors elisp emulators finance french ftp \ games geography german gnome graphics hamradio haskell hebrew hungarian \ ipv6 irc japanese java kde korean lang linux lisp \ - mail math mbone misc multimedia net net-im net-mgmt news \ + mail math mbone misc multimedia net net-im net-mgmt net-p2p news \ palm parallel pear perl5 picobsd plan9 polish portuguese print \ python ruby rubygems russian \ scheme science security shells spanish sysutils \ @@ -2863,7 +2854,7 @@ clean: .if defined(IGNORE_SILENT) IGNORECMD= ${DO_NADA} .else -IGNORECMD= ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE:Q}. +IGNORECMD= ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE:Q}.;exit 1 .endif .for target in check-sanity fetch checksum extract patch configure all build install reinstall package @@ -3389,10 +3380,12 @@ check-conflicts: @found=`${PKG_INFO} -I ${CONFLICTS:C/.+/'&'/} 2>/dev/null | ${AWK} '{print $$1}'`; \ conflicts_with=; \ for entry in $${found}; do \ - prfx=`${PKG_INFO} -q -p "$${entry}" 2> /dev/null | ${SED} -ne '1s/^@cwd //p'`; \ - orgn=`${PKG_INFO} -q -o "$${entry}" 2> /dev/null`; \ - if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ - conflicts_with="$${conflicts_with} $${entry}"; \ + if ${PKG_INFO} -e $${entry} ; then \ + prfx=`${PKG_INFO} -q -p "$${entry}" 2> /dev/null | ${SED} -ne '1s/^@cwd //p'`; \ + orgn=`${PKG_INFO} -q -o "$${entry}" 2> /dev/null`; \ + if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ + conflicts_with="$${conflicts_with} $${entry}"; \ + fi; \ fi; \ done; \ if [ -n "$${conflicts_with}" ]; then \ @@ -4449,6 +4442,16 @@ ${deptype:L}-depends: ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - not found"; \ notfound=1; \ fi; \ + if [ $$notfound != 0 ]; then \ + inverse_dep=`${ECHO_CMD} $$prog | ${SED} \ + -e 's/<=/=gt=/; s/</=ge=/; s/>=/=lt=/; s/>/=le=/' \ + -e 's/=gt=/>/; s/=ge=/>=/; s/=lt=/</; s/=le=/<=/'`; \ + pkg_info=`${PKG_INFO} -E "$$inverse_dep" || ${TRUE}`; \ + if [ "$$pkg_info" != "" ]; then \ + ${ECHO_MSG} "===> Found $$pkg_info, but you need to upgrade to $$prog."; \ + exit 1; \ + fi; \ + fi; \ elif ${WHICH} "$$prog" > /dev/null 2>&1 ; then \ ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - found"; \ if [ ${_DEPEND_ALWAYS} = 1 ]; then \ @@ -4920,11 +4923,11 @@ ${.CURDIR}/README.html: # The following two targets require an up-to-date INDEX in ${PORTSDIR} _PRETTY_PRINT_DEPENDS_LIST=\ - if [ ! -r ${PORTSDIR}/${INDEXFILE} ] ; then \ + if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \ ${ECHO_CMD} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \ else \ ${ECHO_CMD} -n 'This port requires package(s) "' ; \ - ${ECHO_CMD} -n `${AWK} -F\| '$$1 ~ /^${PKGNAME}/ {print $$8;}' ${PORTSDIR}/${INDEXFILE}` ; \ + ${ECHO_CMD} -n `${AWK} -F\| '$$1 ~ /^${PKGNAME}/ {print $$8;}' ${INDEXDIR}/${INDEXFILE}` ; \ ${ECHO_CMD} '" to ${.TARGET:C/pretty-print-(.*)-depends-list/\1/}.'; \ fi; diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index 6f0a5b884839..82ba7d542b74 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -240,7 +240,7 @@ describe: .if defined(PORTSTOP) readmes: readme ${SUBDIR:S/^/_/:S/$/.readmes/} @${ECHO_MSG} "===> Creating README.html for all ports" - @perl ${PORTSDIR}/Tools/make_readmes < ${PORTSDIR}/${INDEXFILE} + @perl ${PORTSDIR}/Tools/make_readmes < ${INDEXDIR}/${INDEXFILE} .else readmes: readme .endif @@ -265,6 +265,7 @@ README= ${TEMPLATES}/README.category .endif COMMENTFILE?= ${.CURDIR}/pkg/COMMENT DESCR?= ${.CURDIR}/pkg/DESCR +INDEXDIR?= ${PORTSDIR} .if ${OSVERSION} >= 500036 INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} .else @@ -333,7 +334,7 @@ PORTSEARCH_IGNORECASE?=1 _PORTSEARCH= \ here=${.CURDIR}; \ - if [ ! -r ${PORTSDIR}/${INDEXFILE} ] ; then \ + if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \ echo "The ${.TARGET} target requires ${INDEXFILE}. Please run make index or make fetchindex."; \ else \ cd ${PORTSDIR}; \ @@ -441,7 +442,8 @@ _PORTSEARCH= \ if (i in disp) \ printf("%s:\t%s\n", names[i], $$i); \ print(""); \ - }' ${PORTSDIR}/${INDEXFILE} ; fi + }' ${INDEXDIR}/${INDEXFILE}; \ + fi search: @${_PORTSEARCH} diff --git a/converters/mule-ucs-emacs20/Makefile b/converters/mule-ucs-emacs20/Makefile index 262b367f731c..ab87cec4ebf1 100644 --- a/converters/mule-ucs-emacs20/Makefile +++ b/converters/mule-ucs-emacs20/Makefile @@ -12,6 +12,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../converters/mule-ucs +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/converters/mule-ucs/Makefile b/converters/mule-ucs/Makefile index 6a546643276b..fc7c337dcc1f 100644 --- a/converters/mule-ucs/Makefile +++ b/converters/mule-ucs/Makefile @@ -25,6 +25,7 @@ MASTER_SITE_M17N+= \ PORTCLASS?= master .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs21 .endif diff --git a/databases/bbdb-emacs20/Makefile b/databases/bbdb-emacs20/Makefile index 0f3f4c56e752..deac19842c81 100644 --- a/databases/bbdb-emacs20/Makefile +++ b/databases/bbdb-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../bbdb +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile index b658e6931ee9..223ae0234b66 100644 --- a/databases/bbdb/Makefile +++ b/databases/bbdb/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= yoichi@FreeBSD.org COMMENT= Big Brother Database +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 ALL_TARGET= bbdb info diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile index 16ae3f6dc639..b48af4d22ce9 100644 --- a/databases/gnats4/Makefile +++ b/databases/gnats4/Makefile @@ -62,6 +62,7 @@ INFO= gnats-faq gnats DOCFILES= NEWS UPGRADING .ifdef WITH_EMACS_PORT +USE_EMACS= yes EMACS_PORT_NAME= ${WITH_EMACS_PORT} CONFIGURE_ARGS+= --with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR} .else diff --git a/databases/lsdb-emacs20/Makefile b/databases/lsdb-emacs20/Makefile index 99ffd41763d3..102207c7ec63 100644 --- a/databases/lsdb-emacs20/Makefile +++ b/databases/lsdb-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../lsdb +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/databases/lsdb/Makefile b/databases/lsdb/Makefile index a1ac7e851fa1..e567b18e6d60 100644 --- a/databases/lsdb/Makefile +++ b/databases/lsdb/Makefile @@ -16,6 +16,7 @@ COMMENT= Lovely Sister Database BUILD_DEPENDS= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if (${EMACS_PORT_NAME} == emacs21) DEPPORT_SUFFIX= diff --git a/deskutils/etask/Makefile b/deskutils/etask/Makefile index 657a8628ea24..47cab34ff435 100644 --- a/deskutils/etask/Makefile +++ b/deskutils/etask/Makefile @@ -19,6 +19,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX-base \ ps2pdf:${PORTSDIR}/print/ghostscript-gnu \ xpdf:${PORTSDIR}/graphics/xpdf +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile index bdc0db530c0a..10bdf437e79b 100644 --- a/deskutils/howm/Makefile +++ b/deskutils/howm/Makefile @@ -14,6 +14,7 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Write fragmentarily and read collectively GNU_CONFIGURE= yes +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 ELISP= action-lock.el bcomp.el cheat-font-lock.el \ howm-common.el howm-date.el howm-menu.el howm-misc.el \ diff --git a/deskutils/mhc-emacs20/Makefile b/deskutils/mhc-emacs20/Makefile index bc01d25a0021..3906f5c2b209 100644 --- a/deskutils/mhc-emacs20/Makefile +++ b/deskutils/mhc-emacs20/Makefile @@ -8,6 +8,7 @@ MASTERDIR= ${.CURDIR}/../mhc MAINTAINER= yoichi@FreeBSD.org +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/deskutils/mhc-xemacs21-mule/Makefile b/deskutils/mhc-xemacs21-mule/Makefile index e4ddb4a4ff3a..56acd3a17e3a 100644 --- a/deskutils/mhc-xemacs21-mule/Makefile +++ b/deskutils/mhc-xemacs21-mule/Makefile @@ -8,6 +8,7 @@ MASTERDIR= ${.CURDIR}/../mhc MAINTAINER= yoichi@FreeBSD.org +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule IGNORE= hangs during build diff --git a/deskutils/mhc/Makefile b/deskutils/mhc/Makefile index c7997951c8a0..8f78cae87dcc 100644 --- a/deskutils/mhc/Makefile +++ b/deskutils/mhc/Makefile @@ -16,6 +16,7 @@ MAINTAINER= yoichi@FreeBSD.org COMMENT= Message Harmonized Calendaring system WRKSRC= ${WRKDIR}/${DISTNAME}/emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .include <bsd.port.pre.mk> diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile index 2ba07d5f02dc..7212352bce08 100644 --- a/deskutils/planner.el/Makefile +++ b/deskutils/planner.el/Makefile @@ -16,6 +16,7 @@ DISTNAME= planner-el-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= dryice@dryice.name COMMENT= PlannerMode is an organizer and day planner for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/deskutils/remember.el/Makefile b/deskutils/remember.el/Makefile index 69fec054678b..5d3085214d38 100644 --- a/deskutils/remember.el/Makefile +++ b/deskutils/remember.el/Makefile @@ -16,6 +16,7 @@ DISTNAME= remember-el-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= dryice@dryice.name COMMENT= A Emacs mode for remembering data +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile index a2cb2da3c457..f9e22c4701f8 100644 --- a/devel/cedet/Makefile +++ b/devel/cedet/Makefile @@ -19,6 +19,7 @@ MAINTAINER= dryice@dryice.name COMMENT= Collection of Emacs Development Environment Tools PORTCLASS= master +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 CEDET_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} diff --git a/devel/distel/Makefile b/devel/distel/Makefile index f3def90aa4f4..a5fb583375ba 100644 --- a/devel/distel/Makefile +++ b/devel/distel/Makefile @@ -26,6 +26,7 @@ PLIST_SUB= VERSION="${PORTVERSION}" HAS_CONFIGURE= yes USE_GMAKE= yes ALL_TARGET= base +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 DISTEL_MANUALS= distel-euc.pdf distel-euc.ps.gz \ diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile index f28b98d646e8..474ded9e87ba 100644 --- a/devel/ecb/Makefile +++ b/devel/ecb/Makefile @@ -17,6 +17,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= dryice@dryice.name COMMENT= Emacs Code Browser +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/devel/eieio-emacs20/Makefile b/devel/eieio-emacs20/Makefile index 61b77f9f7379..506c7cddba24 100644 --- a/devel/eieio-emacs20/Makefile +++ b/devel/eieio-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../eieio +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/devel/eieio/Makefile b/devel/eieio/Makefile index 389948b1deaf..c779f2bb47ab 100644 --- a/devel/eieio/Makefile +++ b/devel/eieio/Makefile @@ -18,6 +18,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= dryice@dryice.name COMMENT= Enhanced Integration of Emacs Interpreted Objects +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/devel/elib-emacs19/Makefile b/devel/elib-emacs19/Makefile index dff3c2bb2ba4..1608d3c8369d 100644 --- a/devel/elib-emacs19/Makefile +++ b/devel/elib-emacs19/Makefile @@ -13,6 +13,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../devel/elib # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs19 .include "${MASTERDIR}/Makefile" diff --git a/devel/elib-emacs20/Makefile b/devel/elib-emacs20/Makefile index 098494f1915b..89ba8c2b8eb2 100644 --- a/devel/elib-emacs20/Makefile +++ b/devel/elib-emacs20/Makefile @@ -13,6 +13,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../devel/elib # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/devel/elib/Makefile b/devel/elib/Makefile index 9396ad1b2162..f2d2fd7ab30e 100644 --- a/devel/elib/Makefile +++ b/devel/elib/Makefile @@ -24,6 +24,7 @@ PORTCLASS?= master # emacs port setup .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs21 .endif diff --git a/devel/pcl-cvs-emacs/Makefile b/devel/pcl-cvs-emacs/Makefile index 24b5bc70c5d4..97b633679350 100644 --- a/devel/pcl-cvs-emacs/Makefile +++ b/devel/pcl-cvs-emacs/Makefile @@ -29,6 +29,7 @@ PORTCLASS?= master # emacs port setup .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs19 CUSTOM_PORT_SUFFIX= -emacs .endif diff --git a/devel/pcl-cvs-emacs20/Makefile b/devel/pcl-cvs-emacs20/Makefile index 83677d6a4a22..d09f823b8c1c 100644 --- a/devel/pcl-cvs-emacs20/Makefile +++ b/devel/pcl-cvs-emacs20/Makefile @@ -13,6 +13,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../devel/pcl-cvs-emacs # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile index b55a451199e6..6be312949914 100644 --- a/devel/psvn/Makefile +++ b/devel/psvn/Makefile @@ -17,6 +17,7 @@ COMMENT= Subversion interface for Emacs RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 NO_WRKSUBDIR= yes diff --git a/devel/semantic-emacs20/Makefile b/devel/semantic-emacs20/Makefile index a9ecb8220076..8d5eda2a61c3 100644 --- a/devel/semantic-emacs20/Makefile +++ b/devel/semantic-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../semantic +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile index 4954123274c3..f555e016466a 100644 --- a/devel/semantic/Makefile +++ b/devel/semantic/Makefile @@ -18,6 +18,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= dryice@dryice.name COMMENT= A lexer, parser-generator, and parser for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/devel/xtla/Makefile b/devel/xtla/Makefile index 6504cd0251dc..f18104b3f1b3 100644 --- a/devel/xtla/Makefile +++ b/devel/xtla/Makefile @@ -20,6 +20,7 @@ BUILD_DEPENDS+= tla:${PORTSDIR}/devel/tla \ ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/tree-widget/tree-widget.el:${PORTSDIR}/editors/tree-widget RUN_DEPENDS= ${BUILD_DEPENDS} +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/editors/apel-emacs19/Makefile b/editors/apel-emacs19/Makefile index 1b291db80de1..bbe90d4c0023 100644 --- a/editors/apel-emacs19/Makefile +++ b/editors/apel-emacs19/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/apel # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs19 .include "${MASTERDIR}/Makefile" diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile index dc2f98fc56fd..b6787ad49d6c 100644 --- a/editors/apel-emacs20/Makefile +++ b/editors/apel-emacs20/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/apel # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile index 9fb50087bc58..8c923e09a122 100644 --- a/editors/apel-mule/Makefile +++ b/editors/apel-mule/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/apel # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= mule .include <${MASTERDIR}/Makefile> diff --git a/editors/apel/Makefile b/editors/apel/Makefile index 8e8850caaddf..0da1c8e5ae3e 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -30,6 +30,7 @@ APEL_VERSION_SPECIFIC_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} PORTCLASS?= master # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 EMACS_MASTERDIR_PKGFILES=YES diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile index 1c0d2a3e2973..e3559969b905 100644 --- a/editors/bitmap-emacs20/Makefile +++ b/editors/bitmap-emacs20/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/bitmap # Setup EMACS_PORT_NAME variable. +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/bitmap-mule/Makefile b/editors/bitmap-mule/Makefile index 9fef02f8a6a1..b8d9767f0823 100644 --- a/editors/bitmap-mule/Makefile +++ b/editors/bitmap-mule/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/bitmap # Setup EMACS_PORT_NAME variable. +USE_EMACS= yes EMACS_PORT_NAME= mule .include <${MASTERDIR}/Makefile> diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile index dbd4f4751430..160f97a7f8d0 100644 --- a/editors/bitmap/Makefile +++ b/editors/bitmap/Makefile @@ -40,6 +40,7 @@ PORTCLASS?= master # Setup EMACS_PORT_NAME variable. .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs21 DEPPORT_SUFFIX= .else diff --git a/editors/custom-emacs/Makefile b/editors/custom-emacs/Makefile index f33df591755b..9e40b88955d3 100644 --- a/editors/custom-emacs/Makefile +++ b/editors/custom-emacs/Makefile @@ -27,6 +27,7 @@ CUSTOM_ELS= cus-edit.el cus-face.el custom.el \ PORTCLASS?= master .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs19 .endif diff --git a/editors/custom-mule/Makefile b/editors/custom-mule/Makefile index 30d2ee090cd1..f50344542992 100644 --- a/editors/custom-mule/Makefile +++ b/editors/custom-mule/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/custom-emacs # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= mule # pkg/* files but PLIST are used in ${.CURDIR} diff --git a/editors/eshell-emacs20/Makefile b/editors/eshell-emacs20/Makefile index 6dbd2c428871..477281c25636 100644 --- a/editors/eshell-emacs20/Makefile +++ b/editors/eshell-emacs20/Makefile @@ -16,6 +16,7 @@ DISTNAME= ${PORTNAME} MAINTAINER= yoichi@FreeBSD.org COMMENT= Command shell implemented in emacs lisp +USE_EMACS= yes EMACS_PORT_NAME= emacs20 PCOMPLETE_VERSION= 1.1.7 diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile index ed7a160b2af9..90803fd65375 100644 --- a/editors/flim-emacs20/Makefile +++ b/editors/flim-emacs20/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/flim # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile index bbddbe69c1e1..4045c43d1c40 100644 --- a/editors/flim-xemacs21-mule/Makefile +++ b/editors/flim-xemacs21-mule/Makefile @@ -14,6 +14,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim COMMENT= FLIM, message representation or encoding elisp library for xemacs21-mule # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule EMACS_PACKAGESDIR= ${EMACS_LIBDIR}/site-packages # packages-subdirectories which this port requires diff --git a/editors/flim/Makefile b/editors/flim/Makefile index e0292a8bad4d..034784f72b68 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -29,6 +29,7 @@ FLIM_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} FLIM_VERSION_SPECIFIC_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs21 DEPPORT_SUFFIX= .else diff --git a/editors/flim113-emacs19/Makefile b/editors/flim113-emacs19/Makefile index d2b8497f6a53..b219755ab18a 100644 --- a/editors/flim113-emacs19/Makefile +++ b/editors/flim113-emacs19/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/flim113 # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs19 .include "${MASTERDIR}/Makefile" diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile index e87e3c765f4b..f301a62279bf 100644 --- a/editors/flim113-emacs20/Makefile +++ b/editors/flim113-emacs20/Makefile @@ -15,6 +15,7 @@ NO_LATEST_LINK= yes MASTERDIR= ${.CURDIR}/../../editors/flim113 # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/flim113-mule/Makefile b/editors/flim113-mule/Makefile index a888e36c64d9..927839bfa481 100644 --- a/editors/flim113-mule/Makefile +++ b/editors/flim113-mule/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/flim113 # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= mule .include "${MASTERDIR}/Makefile" diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile index c6d261b4501d..76bd30ada869 100644 --- a/editors/flim113/Makefile +++ b/editors/flim113/Makefile @@ -33,6 +33,7 @@ FLIM_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} FLIM_VERSION_SPECIFIC_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs21 DEPPORT_SUFFIX= .else diff --git a/editors/gnuserv-emacs20/Makefile b/editors/gnuserv-emacs20/Makefile index 38ecd5a30346..cf02f75a806c 100644 --- a/editors/gnuserv-emacs20/Makefile +++ b/editors/gnuserv-emacs20/Makefile @@ -11,6 +11,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../gnuserv # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index 23637f3ca6b2..eb1c44a3fd62 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -19,6 +19,7 @@ USE_REINPLACE= yes BINSUFFIX?= -emacs +USE_EMACS= yes EMACS_PORT_NAME?=emacs21 .if defined(WITHOUT_X11) diff --git a/editors/iiimecf/Makefile b/editors/iiimecf/Makefile index 2eeff4d6ec01..36b17d645f13 100644 --- a/editors/iiimecf/Makefile +++ b/editors/iiimecf/Makefile @@ -18,6 +18,7 @@ COMMENT= Internet/Intranet Input Method Emacs Client Framework for GNU Emacs 20 BUILD_DEPENDS= ${UN_DEFINE}:${PORTSDIR}/converters/mule-ucs-emacs20 RUN_DEPENDS= ${UN_DEFINE}:${PORTSDIR}/converters/mule-ucs-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= emacs20 UN_DEFINE= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/mule-ucs/un-define.el diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile index 9bc3190d3a75..666912efa0b4 100644 --- a/editors/mode-info/Makefile +++ b/editors/mode-info/Makefile @@ -43,6 +43,7 @@ PLIST_SUB+= MI_WITH_MAKE="" PLIST_SUB+= MI_WITH_MAKE="@comment " .endif +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 EMACS_NO_RUN_DEPENDS= yes LISPDIR?= ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} diff --git a/editors/nxml-emacs21/Makefile b/editors/nxml-emacs21/Makefile index 9feaaae55b03..ed693cbfdf9b 100644 --- a/editors/nxml-emacs21/Makefile +++ b/editors/nxml-emacs21/Makefile @@ -16,6 +16,7 @@ COMMENT= A major mode for editing XML documents for emacs21 # distfile version NXML_VER= 20041004 NXML_STARTUPEL= nxml-startup.el +USE_EMACS= yes EMACS_PORT_NAME=emacs21 INFO= nxml-mode diff --git a/editors/nxml/Makefile b/editors/nxml/Makefile index 9feaaae55b03..ed693cbfdf9b 100644 --- a/editors/nxml/Makefile +++ b/editors/nxml/Makefile @@ -16,6 +16,7 @@ COMMENT= A major mode for editing XML documents for emacs21 # distfile version NXML_VER= 20041004 NXML_STARTUPEL= nxml-startup.el +USE_EMACS= yes EMACS_PORT_NAME=emacs21 INFO= nxml-mode diff --git a/editors/psgml-emacs19/Makefile b/editors/psgml-emacs19/Makefile index e9a65e0f47c4..a9b939160014 100644 --- a/editors/psgml-emacs19/Makefile +++ b/editors/psgml-emacs19/Makefile @@ -12,6 +12,7 @@ COMMENT= A major mode for editing SGML and XML documents for emacs19 MASTERDIR= ${.CURDIR}/../psgml # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs19 BUILD_DEPENDS+= makeinfo:${PORTSDIR}/print/texinfo diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile index 21ee2d530f46..c5ff81e26a13 100644 --- a/editors/psgml-emacs20/Makefile +++ b/editors/psgml-emacs20/Makefile @@ -12,6 +12,7 @@ COMMENT= A major mode for editing SGML and XML documents for emacs20 MASTERDIR= ${.CURDIR}/../psgml # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile index a212a8c2b3bb..51b1b3f467a0 100644 --- a/editors/psgml-mule/Makefile +++ b/editors/psgml-mule/Makefile @@ -12,6 +12,7 @@ COMMENT= A major mode for editing SGML and XML documents for mule MASTERDIR= ${.CURDIR}/../psgml # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= mule BUILD_DEPENDS+= makeinfo:${PORTSDIR}/print/texinfo diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile index 279bc72acaec..a592b0670526 100644 --- a/editors/psgml/Makefile +++ b/editors/psgml/Makefile @@ -30,6 +30,7 @@ PLIST_SUB= PSGML_STARTUPEL=${PSGML_STARTUPEL} NOT_FOR_ARCHS= ia64 # This is a master port. +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} == xemacs21-mule diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile index d0185dea73e6..6554a51aeb92 100644 --- a/editors/semi-emacs20/Makefile +++ b/editors/semi-emacs20/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/semi # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile index 4a40d910023b..12a5c6e179f0 100644 --- a/editors/semi-xemacs21-mule/Makefile +++ b/editors/semi-xemacs21-mule/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/semi # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule EMACS_PACKAGESDIR= ${EMACS_LIBDIR}/site-packages # packages-subdirectories which this port requires diff --git a/editors/semi/Makefile b/editors/semi/Makefile index 7a74418019fa..16ebe2539a18 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -30,6 +30,7 @@ SEMI_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} SEMI_VERSION_SPECIFIC_LISPDIR= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs21 DEPPORT_SUFFIX= .else diff --git a/editors/semi113-emacs19/Makefile b/editors/semi113-emacs19/Makefile index e31820182694..58c52a7114c8 100644 --- a/editors/semi113-emacs19/Makefile +++ b/editors/semi113-emacs19/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/semi113 # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs19 .include "${MASTERDIR}/Makefile" diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile index 74f0c0ee8283..a2e02c625997 100644 --- a/editors/semi113-emacs20/Makefile +++ b/editors/semi113-emacs20/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/semi113 # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include <${MASTERDIR}/Makefile> diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile index 756356005d67..48b7877a8b41 100644 --- a/editors/semi113-mule/Makefile +++ b/editors/semi113-mule/Makefile @@ -14,6 +14,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/semi113 # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME= mule .include <${MASTERDIR}/Makefile> diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile index dfa452e72c04..fc0bbd7759e9 100644 --- a/editors/semi113/Makefile +++ b/editors/semi113/Makefile @@ -35,6 +35,7 @@ SEMI_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} SEMI_VERSION_SPECIFIC_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} .if (${PORTCLASS} == "master") +USE_EMACS= yes EMACS_PORT_NAME= emacs21 DEPPORT_SUFFIX= .else diff --git a/editors/slime/Makefile b/editors/slime/Makefile index 9416d721acba..eae2fd79bbb3 100644 --- a/editors/slime/Makefile +++ b/editors/slime/Makefile @@ -14,6 +14,7 @@ MAINTAINER= dom@happygiraffe.net COMMENT= Superior Lisp Interaction Mode for Emacs USE_GMAKE= yes +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 INFO= slime diff --git a/editors/speedbar-emacs20/Makefile b/editors/speedbar-emacs20/Makefile index f48df7ca14ea..df3bcdb1ccea 100644 --- a/editors/speedbar-emacs20/Makefile +++ b/editors/speedbar-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../../editors/speedbar +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile index 3500abca2815..95b44dd62e75 100644 --- a/editors/speedbar/Makefile +++ b/editors/speedbar/Makefile @@ -18,6 +18,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/} MAINTAINER= dryice@dryice.name COMMENT= Quick access to files and tags in an Emacs frame +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 USE_REINPLACE= yes diff --git a/editors/tamago-emacs20/Makefile b/editors/tamago-emacs20/Makefile index cb436ebbbc17..8134ec329412 100644 --- a/editors/tamago-emacs20/Makefile +++ b/editors/tamago-emacs20/Makefile @@ -9,6 +9,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Multilingual Input Method - Egg V4 for Emacs20 MASTERDIR= ${.CURDIR}/../tamago + +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile index abae26b70ab3..4faf10dbf533 100644 --- a/editors/tamago-emacs21/Makefile +++ b/editors/tamago-emacs21/Makefile @@ -25,6 +25,7 @@ USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 WRKSRC= ${WRKDIR}/egg-4.0.6+0.20041122cvs diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index abae26b70ab3..4faf10dbf533 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -25,6 +25,7 @@ USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 WRKSRC= ${WRKDIR}/egg-4.0.6+0.20041122cvs diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile index 93ee77f5aa63..d6cf5301efa7 100644 --- a/editors/tree-widget/Makefile +++ b/editors/tree-widget/Makefile @@ -16,6 +16,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= dryice@dryice.name COMMENT= A tree widget for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/games/emacs-chess/Makefile b/games/emacs-chess/Makefile index c475636bad56..c8abd5059af7 100644 --- a/games/emacs-chess/Makefile +++ b/games/emacs-chess/Makefile @@ -18,6 +18,7 @@ DISTFILES= chess-${PORTVERSION}.tar.bz2 \ MAINTAINER= dryice@dryice.name COMMENT= Play chess with emacs +USE_EMACS= yes EMACS_PORT_NAME= emacs21 USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile index 8df886ee4ca2..80be7e6c24c8 100644 --- a/graphics/xface.el/Makefile +++ b/graphics/xface.el/Makefile @@ -23,6 +23,7 @@ COMMENT= X-Face encoder/decoder/viewer for Emacsen RUN_DEPENDS= compface:${PORTSDIR}/mail/faces +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 LISP_FILES= x-face diff --git a/irc/erc/Makefile b/irc/erc/Makefile index a8a59c8fb90f..2880b022aa5c 100644 --- a/irc/erc/Makefile +++ b/irc/erc/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= karma@ez.pereslavl.ru COMMENT= ERC is an Emacs InternetRelayChat client +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 ERC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} diff --git a/irc/irchat-pj-emacs20/Makefile b/irc/irchat-pj-emacs20/Makefile index 03f9362d946d..cc1020adc58d 100644 --- a/irc/irchat-pj-emacs20/Makefile +++ b/irc/irchat-pj-emacs20/Makefile @@ -25,6 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/${LISPDIR:S,${PORTNAME},pure,g}/pure-make.el:${PORTSDI ${LOCALBASE}/bin/dcc:${PORTSDIR}/irc/dcc USE_BZIP2= yes +USE_EMACS= yes EMACS_PORT_NAME?= emacs20 XEMACS_ONLY?= "@comment " LISPDIR?= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} diff --git a/irc/irchat-pj-emacs21/Makefile b/irc/irchat-pj-emacs21/Makefile index a00d90a1c8f2..1dbcb64c9e10 100644 --- a/irc/irchat-pj-emacs21/Makefile +++ b/irc/irchat-pj-emacs21/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../irchat-pj-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= emacs21 .include "${MASTERDIR}/Makefile" diff --git a/irc/irchat-pj-xemacs21-mule/Makefile b/irc/irchat-pj-xemacs21-mule/Makefile index a6acf1b79ea2..64a5c76c18de 100644 --- a/irc/irchat-pj-xemacs21-mule/Makefile +++ b/irc/irchat-pj-xemacs21-mule/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../irchat-pj-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule XEMACS_ONLY= "" LISPDIR= lib/xemacs/site-packages/lisp/${PORTNAME} diff --git a/irc/pure-emacs20/Makefile b/irc/pure-emacs20/Makefile index 5b966c17dc55..fef7b015749e 100644 --- a/irc/pure-emacs20/Makefile +++ b/irc/pure-emacs20/Makefile @@ -21,6 +21,7 @@ MAINTAINER= yoichi@FreeBSD.org COMMENT= Primitive Universal Relay-chat Environment USE_BZIP2= yes +USE_EMACS= yes EMACS_PORT_NAME?= emacs20 LISPDIR?= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} EMACS_ONLY?= "" diff --git a/irc/pure-emacs21/Makefile b/irc/pure-emacs21/Makefile index 6ce0f6197e41..e9689e50b2d7 100644 --- a/irc/pure-emacs21/Makefile +++ b/irc/pure-emacs21/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../pure-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= emacs21 .include "${MASTERDIR}/Makefile" diff --git a/irc/pure-xemacs21-mule/Makefile b/irc/pure-xemacs21-mule/Makefile index 5763084442de..27659fc583aa 100644 --- a/irc/pure-xemacs21-mule/Makefile +++ b/irc/pure-xemacs21-mule/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../pure-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule LISPDIR= ${EMACS_LIBDIR}/site-packages/lisp/${PORTNAME} EMACS_ONLY= "@comment " diff --git a/irc/riece-emacs20/Makefile b/irc/riece-emacs20/Makefile index fac8547af3b7..463ad0f0dfca 100644 --- a/irc/riece-emacs20/Makefile +++ b/irc/riece-emacs20/Makefile @@ -6,6 +6,7 @@ MASTERDIR= ${.CURDIR}/../riece +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile index 9294f406abd1..2e698784f796 100644 --- a/irc/riece-emacs21/Makefile +++ b/irc/riece-emacs21/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= yasu@utahime.org COMMENT= IRC client for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ diff --git a/irc/riece/Makefile b/irc/riece/Makefile index 9294f406abd1..2e698784f796 100644 --- a/irc/riece/Makefile +++ b/irc/riece/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= yasu@utahime.org COMMENT= IRC client for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ diff --git a/japanese/ddskk-emacs20/Makefile b/japanese/ddskk-emacs20/Makefile index 3664197a2122..25cd876fa579 100644 --- a/japanese/ddskk-emacs20/Makefile +++ b/japanese/ddskk-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../ddskk +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile index c669d8ac47ce..08fabca81610 100644 --- a/japanese/ddskk/Makefile +++ b/japanese/ddskk/Makefile @@ -19,6 +19,7 @@ COMMENT= Simple Kana to Kanji conversion program on Emacsen BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} RUN_DEPENDS= ${BUILD_DEPENDS} +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if (${EMACS_PORT_NAME} == emacs21) DEPPORT_SUFFIX= diff --git a/japanese/diclookup-emacs20/Makefile b/japanese/diclookup-emacs20/Makefile index 1e0174441f5b..ea2306ba6d24 100644 --- a/japanese/diclookup-emacs20/Makefile +++ b/japanese/diclookup-emacs20/Makefile @@ -18,6 +18,7 @@ COMMENT= CDROM dictionary client for emacs. (needs ndtpd or dserver package) RUN_DEPENDS= ${FONTSDIR}/a18rk.pcf.gz:${PORTSDIR}/x11-fonts/intlfonts WRKSRC= ${WRKDIR}/diclookup-mule-${PORTVERSION} +USE_EMACS= yes EMACS_PORT_NAME?= emacs20 MAKE_ARGS+= LISPDIR="${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/diclookup" FONTSDIR= ${X11BASE}/lib/X11/fonts/local diff --git a/japanese/egg-canna/Makefile b/japanese/egg-canna/Makefile index eb6866ade748..c054c389eaeb 100644 --- a/japanese/egg-canna/Makefile +++ b/japanese/egg-canna/Makefile @@ -19,6 +19,7 @@ COMMENT= Canna Conversion Facility in Egg Input Method Architecture BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/egg/egg-sim.el:${PORTSDIR}/editors/tamago${EMACS_SUFFIX} RUN_DEPENDS= ${BUILD_DEPENDS} +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} == emacs21 diff --git a/japanese/elisp-manual/Makefile b/japanese/elisp-manual/Makefile index 01bf0b29e3d7..f85f51202b56 100644 --- a/japanese/elisp-manual/Makefile +++ b/japanese/elisp-manual/Makefile @@ -21,6 +21,7 @@ COMMENT= Japanese translation of the GNU Emacs Lisp Reference Manual BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash +USE_EMACS= yes EMACS_PORT_NAME= emacs20 EMACS_NO_RUN_DEPENDS= YES USE_REINPLACE= yes diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile index cf50b42154bc..67ac12a52906 100644 --- a/japanese/emacs-manual/Makefile +++ b/japanese/emacs-manual/Makefile @@ -19,6 +19,7 @@ COMMENT= Japanese translation of the GNU Emacs Manual BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash +USE_EMACS= yes EMACS_PORT_NAME= emacs20 EMACS_NO_RUN_DEPENDS= YES USE_REINPLACE= yes diff --git a/japanese/lookup-emacs20/Makefile b/japanese/lookup-emacs20/Makefile index 68ad0894bcd7..7697a78a45de 100644 --- a/japanese/lookup-emacs20/Makefile +++ b/japanese/lookup-emacs20/Makefile @@ -8,6 +8,8 @@ RUN_DEPENDS= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/bitmap/bitmap.el:${PORTSDIR}/editors/bitmap-emacs20 \ MASTERDIR= ${.CURDIR}/../lookup + +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile index dd8ae53974e6..3af32433ea68 100644 --- a/japanese/lookup-emacs21/Makefile +++ b/japanese/lookup-emacs21/Makefile @@ -18,6 +18,7 @@ COMMENT= Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc FILESDIR= ${.CURDIR}/../lookup/files PKGDIR= ${.CURDIR}/../lookup PLIST= ${.CURDIR}/pkg-plist +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 INFO?= lookup lookup-guide diff --git a/japanese/lookup-xemacs/Makefile b/japanese/lookup-xemacs/Makefile index 9b5fe53df0ce..7234c7d4b857 100644 --- a/japanese/lookup-xemacs/Makefile +++ b/japanese/lookup-xemacs/Makefile @@ -9,6 +9,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.cookie:$ RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.cookie:${PORTSDIR}/editors/xemacs-packages MASTERDIR= ${.CURDIR}/../lookup +USE_EMACS= yes EMACS_PORT_NAME=xemacs21-mule .if defined(PARALLEL_PACKAGE_BUILD) diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile index dd8ae53974e6..3af32433ea68 100644 --- a/japanese/lookup/Makefile +++ b/japanese/lookup/Makefile @@ -18,6 +18,7 @@ COMMENT= Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc FILESDIR= ${.CURDIR}/../lookup/files PKGDIR= ${.CURDIR}/../lookup PLIST= ${.CURDIR}/pkg-plist +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 INFO?= lookup lookup-guide diff --git a/japanese/migemo-emacs20/Makefile b/japanese/migemo-emacs20/Makefile index ecef750fc4b3..3cde626cf335 100644 --- a/japanese/migemo-emacs20/Makefile +++ b/japanese/migemo-emacs20/Makefile @@ -12,6 +12,7 @@ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist PKGMESSAGE= ${MASTERDIR}/pkg-message +USE_EMACS= yes EMACS_PORT_NAME= emacs20 BUILD_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} RUN_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} \ diff --git a/japanese/migemo-emacs21/Makefile b/japanese/migemo-emacs21/Makefile index 41604b414cf3..c20b48ca79a6 100644 --- a/japanese/migemo-emacs21/Makefile +++ b/japanese/migemo-emacs21/Makefile @@ -12,6 +12,7 @@ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist PKGMESSAGE= ${MASTERDIR}/pkg-message +USE_EMACS= yes EMACS_PORT_NAME= emacs21 BUILD_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel RUN_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel \ diff --git a/japanese/migemo-xemacs-devel-mule/Makefile b/japanese/migemo-xemacs-devel-mule/Makefile index a59331bebb1c..f037d99321d6 100644 --- a/japanese/migemo-xemacs-devel-mule/Makefile +++ b/japanese/migemo-xemacs-devel-mule/Makefile @@ -12,6 +12,7 @@ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist PKGMESSAGE= ${MASTERDIR}/pkg-message +USE_EMACS= yes EMACS_PORT_NAME= xemacs-devel-mule HAS_CONFIGURE= yes diff --git a/japanese/migemo-xemacs21-mule/Makefile b/japanese/migemo-xemacs21-mule/Makefile index 4434d12522f8..1b5dc631ca8c 100644 --- a/japanese/migemo-xemacs21-mule/Makefile +++ b/japanese/migemo-xemacs21-mule/Makefile @@ -12,6 +12,7 @@ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist PKGMESSAGE= ${MASTERDIR}/pkg-message +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule EMACS_PACKAGESDIR= lib/xemacs/site-packages BUILD_DEPENDS= ${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages diff --git a/japanese/navi2ch-emacs20/Makefile b/japanese/navi2ch-emacs20/Makefile index cfcd7b95fdc3..4f489da6c9a5 100644 --- a/japanese/navi2ch-emacs20/Makefile +++ b/japanese/navi2ch-emacs20/Makefile @@ -17,6 +17,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= sf@FreeBSD.org COMMENT= 2ch.net and 2ch-like BBS navigator for Emacsen +USE_EMACS= yes EMACS_PORT_NAME?= emacs20 INFO= navi2ch diff --git a/japanese/navi2ch-emacs21/Makefile b/japanese/navi2ch-emacs21/Makefile index 29ff7093446a..fd3344111433 100644 --- a/japanese/navi2ch-emacs21/Makefile +++ b/japanese/navi2ch-emacs21/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../navi2ch-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= emacs21 .if !defined(WITHOUT_X11) diff --git a/japanese/navi2ch-xemacs21-mule/Makefile b/japanese/navi2ch-xemacs21-mule/Makefile index 5e0c9d0a6933..5a3a59fe2241 100644 --- a/japanese/navi2ch-xemacs21-mule/Makefile +++ b/japanese/navi2ch-xemacs21-mule/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../navi2ch-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule BUILD_DEPENDS= ${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-base:${PORTSDIR}/editors/xemacs-packages diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile index 29ff7093446a..fd3344111433 100644 --- a/japanese/navi2ch/Makefile +++ b/japanese/navi2ch/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../navi2ch-emacs20 +USE_EMACS= yes EMACS_PORT_NAME= emacs21 .if !defined(WITHOUT_X11) diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile index 985beeddc5f4..2fb48cb05ac9 100644 --- a/japanese/skk10-elisp-emacs20/Makefile +++ b/japanese/skk10-elisp-emacs20/Makefile @@ -24,6 +24,7 @@ PORT_CLASS?= master .if (${PORT_CLASS} == "master") # emacsen-port-name +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .endif diff --git a/japanese/weather-emacs20/Makefile b/japanese/weather-emacs20/Makefile index 0ca7d4043db9..4ab35f00a4e7 100644 --- a/japanese/weather-emacs20/Makefile +++ b/japanese/weather-emacs20/Makefile @@ -16,6 +16,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= yoichi@FreeBSD.org COMMENT= Weather Report in Japanese Regions +USE_EMACS= yes EMACS_PORT_NAME?= emacs20 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile index 617220cc6c9d..c595b1649370 100644 --- a/japanese/yc.el/Makefile +++ b/japanese/yc.el/Makefile @@ -15,6 +15,7 @@ DISTNAME= yc-${PORTVERSION} MAINTAINER= t@nakao.org COMMENT= Yet another Canna client for Emacs/XEmacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 YC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc diff --git a/java/jde/Makefile b/java/jde/Makefile index ed387cfd26b3..4f0da1a7a160 100644 --- a/java/jde/Makefile +++ b/java/jde/Makefile @@ -14,6 +14,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= dougk@dougk-ff7.net COMMENT= Java Development Environment for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile index d13f131f00df..fd30457ceceb 100644 --- a/lang/bigloo/Makefile +++ b/lang/bigloo/Makefile @@ -19,6 +19,7 @@ COMMENT= A Scheme interpreter and native code compiler USE_GMAKE= yes ALL_TARGET= INSTALL_TARGET= install compile-bee install-bee +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 MAN1= bigloo.1 INFO= bigloo diff --git a/lang/quack/Makefile b/lang/quack/Makefile index efe8997c2786..9b22924bdeaa 100644 --- a/lang/quack/Makefile +++ b/lang/quack/Makefile @@ -18,6 +18,7 @@ COMMENT= Enhanced support for editing and running Scheme code RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 NO_WRKSUBDIR= yes diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile index 5c0e9746ece9..0419d86243b6 100644 --- a/lang/sml-mode.el/Makefile +++ b/lang/sml-mode.el/Makefile @@ -17,6 +17,7 @@ COMMENT= An EMACS mode for editing Standard ML programs ALL_TARGET= default +USE_EMACS= yes EMACS_PORT_NAME= emacs21 # diff --git a/mail/c-sig-emacs21/Makefile b/mail/c-sig-emacs21/Makefile index 13f8fb116678..637302cecd0e 100644 --- a/mail/c-sig-emacs21/Makefile +++ b/mail/c-sig-emacs21/Makefile @@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= yasu@utahime.org COMMENT= Signature insertion tool for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 EMACS_NO_BUILD_DEPENDS= yes diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile index 13f8fb116678..637302cecd0e 100644 --- a/mail/c-sig/Makefile +++ b/mail/c-sig/Makefile @@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= yasu@utahime.org COMMENT= Signature insertion tool for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 EMACS_NO_BUILD_DEPENDS= yes diff --git a/mail/emh-emacs20/Makefile b/mail/emh-emacs20/Makefile index f7523f56d2ba..8230c3f9bb16 100644 --- a/mail/emh-emacs20/Makefile +++ b/mail/emh-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../emh +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/mail/emh-xemacs21-mule/Makefile b/mail/emh-xemacs21-mule/Makefile index 883306aa01e2..0e4d54d5d7a8 100644 --- a/mail/emh-xemacs21-mule/Makefile +++ b/mail/emh-xemacs21-mule/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../emh +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule .include "${MASTERDIR}/Makefile" diff --git a/mail/emh/Makefile b/mail/emh/Makefile index aa0f7d52f295..c9298733c6ea 100644 --- a/mail/emh/Makefile +++ b/mail/emh/Makefile @@ -20,6 +20,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi${D SEMI_TRUNK= 1.14 SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} == "emacs21" diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile index 81215d162486..34a630184e22 100644 --- a/mail/mailcrypt/Makefile +++ b/mail/mailcrypt/Makefile @@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= An Emacs/PGP interface +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 GNU_CONFIGURE= yes diff --git a/mail/mew-emacs20/Makefile b/mail/mew-emacs20/Makefile index 728a82a1111f..d80448b47b7f 100644 --- a/mail/mew-emacs20/Makefile +++ b/mail/mew-emacs20/Makefile @@ -12,6 +12,7 @@ COMMENT= Message interface to Emacs Window for emacs20 MASTERDIR= ${.CURDIR}/../mew # set emacs port +USE_EMACS= yes EMACS_PORT_NAME=emacs20 # target name for make build and install diff --git a/mail/mew-mule/Makefile b/mail/mew-mule/Makefile index 17a193657701..8c32857b3796 100644 --- a/mail/mew-mule/Makefile +++ b/mail/mew-mule/Makefile @@ -12,6 +12,7 @@ COMMENT= Message interface to Emacs Window for mule MASTERDIR= ${.CURDIR}/../mew # set emacs port +USE_EMACS= yes EMACS_PORT_NAME=mule # target name for make build and install diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 4e7fcdb1f100..d13e53498d28 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -28,6 +28,7 @@ EMACS_SETUPEL= ${PORTNAME}-setup.el MEW_DOCDIR?= share/doc/${PORTNAME} # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME?= emacs19 # target name for make build and install diff --git a/mail/mew2-emacs20/Makefile b/mail/mew2-emacs20/Makefile index 90ec42e10966..fd7ad0a5f5e4 100644 --- a/mail/mew2-emacs20/Makefile +++ b/mail/mew2-emacs20/Makefile @@ -18,6 +18,7 @@ MASTERDIR= ${.CURDIR}/../mew${MEW_MAJOR_VER} PKGDIR= ${.CURDIR} # set emacs port +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile index 8a0a6b04c66a..0b8a1ef8cee5 100644 --- a/mail/mew2/Makefile +++ b/mail/mew2/Makefile @@ -28,6 +28,7 @@ MEW_VER= ${MEW_MAJOR_VER}.2 MEW_DOCDIR?= share/doc/${PORTNAME}${MEW_MAJOR_VER} # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 # target name for make build and install diff --git a/mail/mew3-emacs20/Makefile b/mail/mew3-emacs20/Makefile index 97672d0d2705..7577b4c1d461 100644 --- a/mail/mew3-emacs20/Makefile +++ b/mail/mew3-emacs20/Makefile @@ -21,6 +21,7 @@ PKGDIR= ${.CURDIR} PKGMESSAGE= ${MASTERDIR}/pkg-message # set emacs port +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${MASTERDIR}/Makefile" diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile index e04f1d0ce122..b164a0fe9f3d 100644 --- a/mail/mew3/Makefile +++ b/mail/mew3/Makefile @@ -27,6 +27,7 @@ MEW_VER= ${MEW_MAJOR_VER}.3 DOCSDIR= share/doc/${PORTNAME}${MEW_MAJOR_VER} # emacs port setup +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 # target name for make build and install diff --git a/mail/vm/Makefile b/mail/vm/Makefile index ef64bc6c23be..3f379c410e64 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -25,6 +25,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= olive@oban.frmug.org COMMENT= A mail reader running inside Emacs or XEmacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 MAKE_ARGS= prefix=${PREFIX} \ INFODIR=${PREFIX}/info \ diff --git a/mail/wanderlust-emacs20/Makefile b/mail/wanderlust-emacs20/Makefile index 79cf4f719b62..e1820ca5abfa 100644 --- a/mail/wanderlust-emacs20/Makefile +++ b/mail/wanderlust-emacs20/Makefile @@ -9,6 +9,7 @@ MASTERDIR= ${.CURDIR}/../../mail/wanderlust COMMENT= Yet another message interface on Emacsen +USE_EMACS= yes EMACS_PORT_NAME= emacs20 MIMEUI_PORT_NAME= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME} EMACS_W3M_PORT_NAME= emacs-w3m-${EMACS_PORT_NAME} diff --git a/mail/wanderlust-xemacs21-mule/Makefile b/mail/wanderlust-xemacs21-mule/Makefile index a6ab90527185..b7bd08f2b6f3 100644 --- a/mail/wanderlust-xemacs21-mule/Makefile +++ b/mail/wanderlust-xemacs21-mule/Makefile @@ -9,6 +9,7 @@ MASTERDIR= ${.CURDIR}/../../mail/wanderlust COMMENT= Yet another message interface on Emacsen +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule EMACS_PACKAGESDIR= lib/xemacs/site-packages MANIFEST= MANIFEST.wl diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile index ff32aae66e28..a72976eb6acc 100644 --- a/mail/wanderlust/Makefile +++ b/mail/wanderlust/Makefile @@ -18,6 +18,7 @@ DISTNAME= wl-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Yet another message interface on Emacsen +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT} diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index 6f96c06ce9f4..ce06d4375347 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -32,6 +32,7 @@ MAN1= gnuplot.1 lasergnu.1 INFO= gnuplot .if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs) +USE_EMACS= yes EMACS_PORT_NAME= emacs21 EMACS_NO_BUILD_DEPENDS= yes EMACS_NO_RUN_DEPENDS= yes diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index f7d264d1de76..2dda91f7585d 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= . old MAINTAINER= yoichi@FreeBSD.org COMMENT= GNU screen like utility on Emacsen +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if (${EMACS_PORT_NAME} == "emacs21") DEPPORT_SUFFIX= diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile index cdc42e127cd9..0ecfdcc87fff 100644 --- a/net/gnu-radius/Makefile +++ b/net/gnu-radius/Makefile @@ -101,6 +101,7 @@ CONFIGURE_ARGS+= --enable-notify .endif .if defined(WITH_EMACS) +USE_EMACS= yes EMACS_PORT_NAME= emacs20 .include "${PORTSDIR}/Mk/bsd.emacs.mk" CONFIGURE_ARGS+= --with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR} diff --git a/net/tramp/Makefile b/net/tramp/Makefile index 8a099b084be4..740ba72f8d56 100644 --- a/net/tramp/Makefile +++ b/net/tramp/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= ports@FreeBSD.org COMMENT= Transparent remote file access tool for emacsen +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 USE_GMAKE= yes diff --git a/news/gnus-emacs20/Makefile b/news/gnus-emacs20/Makefile index a6778cbe7c9b..4ebf08d7e7fc 100644 --- a/news/gnus-emacs20/Makefile +++ b/news/gnus-emacs20/Makefile @@ -19,6 +19,7 @@ COMMENT= A popular newsreader for emacs20 HAS_CONFIGURE= yes +USE_EMACS= yes EMACS_PORT_NAME?=emacs20 CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ diff --git a/print/auctex/Makefile b/print/auctex/Makefile index 144ab837576f..75dbf0723a7c 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -24,6 +24,7 @@ CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${LISPDIR} \ --with-auto-dir=${PREFIX}/${LISPDIR}/auctex/auto \ --with-texmf-dir=${PREFIX}/${TEXMFDIR} +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 LISPDIR= ${EMACS_VERSION_SITE_LISPDIR} diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile index f24d548aa015..1e3c66cbb906 100644 --- a/print/yatex-mule/Makefile +++ b/print/yatex-mule/Makefile @@ -10,6 +10,7 @@ PKGNAMESUFFIX= -mule MASTERDIR= ${.CURDIR}/../yatex COMMENT= Yet Another LaTeX mode and html mode on Emacs (for mule 2.3) +USE_EMACS= yes EMACS_PORT_NAME=mule .include "${MASTERDIR}/Makefile" diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile index 0a40fdf275ab..1c927b34c15e 100644 --- a/print/yatex-xemacs-mule/Makefile +++ b/print/yatex-xemacs-mule/Makefile @@ -10,6 +10,7 @@ PKGNAMESUFFIX= -xemacs-mule MASTERDIR= ${.CURDIR}/../yatex COMMENT= Yet Another LaTeX mode and html mode on Emacs (for XEmacs21-mule) +USE_EMACS= yes EMACS_PORT_NAME=xemacs21-mule IGNORE= hangs during build diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile index 0e4f35013136..76ef32c03456 100644 --- a/print/yatex-xemacs/Makefile +++ b/print/yatex-xemacs/Makefile @@ -10,6 +10,7 @@ PKGNAMESUFFIX= -xemacs MASTERDIR= ${.CURDIR}/../yatex COMMENT= Yet Another LaTeX mode and html mode on Emacs (for XEmacs21) +USE_EMACS= yes EMACS_PORT_NAME=xemacs21 .include "${MASTERDIR}/Makefile" diff --git a/print/yatex/Makefile b/print/yatex/Makefile index 69bcaee08226..6ec2888627a2 100644 --- a/print/yatex/Makefile +++ b/print/yatex/Makefile @@ -19,6 +19,7 @@ PKGDEINSTALL= ${WRKDIR}/DEINSTALL PKGMESSAGE= ${WRKDIR}/MESSAGE WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} +USE_EMACS= yes EMACS_PORT_NAME?=emacs21 EMACS_NO_RUN_DEPENDS=YES .if (${EMACS_PORT_NAME} != xemacs21-mule) diff --git a/security/starttls/Makefile b/security/starttls/Makefile index a8dabb80d292..985d9b3a73c4 100644 --- a/security/starttls/Makefile +++ b/security/starttls/Makefile @@ -15,6 +15,7 @@ COMMENT= Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME} GNU_CONFIGURE= yes USE_GMAKE= yes +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .include <bsd.port.mk> diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile index 4a429d820216..982d6c506222 100644 --- a/textproc/dictionary/Makefile +++ b/textproc/dictionary/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= dryice@dryice.name COMMENT= A dictionary client for Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} diff --git a/textproc/emacs-wiki/Makefile b/textproc/emacs-wiki/Makefile index 677674792f1c..d8f3c445fc64 100644 --- a/textproc/emacs-wiki/Makefile +++ b/textproc/emacs-wiki/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= dryice@dryice.name COMMENT= Create and use hyperlinks and simple formatting in plain text files +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile index 6a2ee7d8e66b..362a092a6ac9 100644 --- a/textproc/xml-lite.el/Makefile +++ b/textproc/xml-lite.el/Makefile @@ -17,6 +17,7 @@ EXTRACT_ONLY= # empty MAINTAINER= ports@FreeBSD.org COMMENT= A simple XML-editing for GNU Emacs +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 EMACS_NO_BUILD_DEPENDS= YES diff --git a/textproc/xml-parse.el/Makefile b/textproc/xml-parse.el/Makefile index f1037b8fac6f..fa330b49639e 100644 --- a/textproc/xml-parse.el/Makefile +++ b/textproc/xml-parse.el/Makefile @@ -18,6 +18,7 @@ EXTRACT_ONLY= MAINTAINER= dryice@dryice.name COMMENT= Code to efficiently read/write XML data with Elisp +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 .if ${EMACS_PORT_NAME} != "emacs21" diff --git a/www/emacs-w3m-emacs20/Makefile b/www/emacs-w3m-emacs20/Makefile index cdab274935e5..1f98e935defc 100644 --- a/www/emacs-w3m-emacs20/Makefile +++ b/www/emacs-w3m-emacs20/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../emacs-w3m +USE_EMACS= yes EMACS_PORT_NAME= emacs20 COMMENT= Simple front-end to w3m for emacs20 PLIST= ${.CURDIR}/pkg-plist diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile index 3e0c9c8485d5..222b6d6a2238 100644 --- a/www/emacs-w3m-xemacs21-mule/Makefile +++ b/www/emacs-w3m-xemacs21-mule/Makefile @@ -7,6 +7,7 @@ MASTERDIR= ${.CURDIR}/../emacs-w3m +USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule COMMENT= Simple front-end to w3m for xemacs21-mule diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 6a61af5c6364..b9ca99fda877 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -15,6 +15,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Simple front-end to w3m for emacs21 +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 CONFIGURE_ARGS?= --with-emacs=${EMACS_CMD} \ diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile index 6afff4414d0f..3f5592d77839 100644 --- a/www/w3-4/Makefile +++ b/www/w3-4/Makefile @@ -19,6 +19,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-emacs=yes INSTALL_TARGET= install +USE_EMACS= yes EMACS_PORT_NAME?= emacs21 INFO= w3-faq w3 |