diff options
Diffstat (limited to 'editors')
36 files changed, 102 insertions, 107 deletions
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile index 16a0dc773b77..949b2ef16bf6 100644 --- a/editors/elvis/Makefile +++ b/editors/elvis/Makefile @@ -20,13 +20,13 @@ CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis MAN1= elvis.1 elvtags.1 ref.1 # Support building on systems with or without X11 installed. -.if defined(NO_X11) +.if defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-x=no .else USE_XLIB= yes pre-fetch: - @${ECHO_MSG} "To build this port without X11, define \"NO_X11\"." + @${ECHO_MSG} "To build this port without X11, define \"WITHOUT_X11\"." .endif pre-configure: diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index fd21bc2971ae..2aa74d63a907 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile index fd21bc2971ae..2aa74d63a907 100644 --- a/editors/emacs19/Makefile +++ b/editors/emacs19/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile index ca41aab9bd40..ee6f7a1243f2 100644 --- a/editors/emacs20-dl/Makefile +++ b/editors/emacs20-dl/Makefile @@ -28,7 +28,7 @@ USE_GMAKE= yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EMACS_VER= 20.6 CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop USE_XLIB= yes .else @@ -43,11 +43,9 @@ PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \ SCRIPTS_ENV= SED=${SED} MV=${MV} \ DOC_FILE=${DOC_FILE} -.if defined(USE_XPG4) -.if (${USE_XPG4} == "YES" || ${USE_XPG4} == "yes") +.if defined(WITH_XPG4) CONFIGURE_ARGS+= --with-xpg4 .endif -.endif pre-build: @${RM} -rf ${WRKSRC}/info/* diff --git a/editors/emacs20-dl/pkg-descr b/editors/emacs20-dl/pkg-descr index cc0bd59dcd7f..76e86dd7690f 100644 --- a/editors/emacs20-dl/pkg-descr +++ b/editors/emacs20-dl/pkg-descr @@ -15,7 +15,7 @@ warning message may be displayed: Warning: locale not supported by C library, locale unchanged -If you complain about this message, type `make install USE_XPG4=YES' +If you complain about this message, type `make install WITH_XPG4=yes' at the "${PORTSDIR}/editors/japanese" directory to re-make this package. WWW: http://www.m17n.org/mule/dynamic-loading/ diff --git a/editors/emacs20-dl/pkg-message b/editors/emacs20-dl/pkg-message index 7beccddf9233..fcc358a279cc 100644 --- a/editors/emacs20-dl/pkg-message +++ b/editors/emacs20-dl/pkg-message @@ -7,7 +7,7 @@ Warning: locale not supported by C library, locale unchanged - If you complain about this message, type `make install USE_XPG4=YES' + If you complain about this message, type `make install WITH_XPG4=yes' at the "${PORTSDIR}/editors/emacs20-dl" directory to re-make this package. **************************************************************************** diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 3640b925ea0b..fb51927f9cd4 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -18,7 +18,7 @@ Y2K= http://www.gnu.org/software/year2000.html USE_AUTOCONF= yes USE_GMAKE= yes CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop USE_XLIB= yes .else @@ -30,16 +30,14 @@ MAN1= emacs.1 etags.1 ctags.1 PLIST_SUB= EMACS_VER=20.6 EMACS_ARCH=${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/emacs-20.6 -.if defined(USE_XPG4) -.if (${USE_XPG4} == "YES" || ${USE_XPG4} == "yes") +.if defined(WITH_XPG4) CONFIGURE_ARGS+= --with-xpg4 .endif -.endif pre-fetch: -.if !defined(USE_XPG4) +.if !defined(WITH_XPG4) @${ECHO_MSG} "NOTE: You can have international locale library support " - @${ECHO_MSG} "by adding \"USE_XPG4=YES\" to argument of make." + @${ECHO_MSG} "by adding \"WITH_XPG4=yes\" to argument of make." .endif pre-build: diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index fd21bc2971ae..2aa74d63a907 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index fd21bc2971ae..2aa74d63a907 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -22,7 +22,7 @@ NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 GNU_CONFIGURE= yes USE_GMAKE= yes -.if !defined(NO_X11) +.if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --sharedstatedir=/var/run USE_XLIB= yes .else diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/staroffice5/Makefile +++ b/editors/staroffice5/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index cbe4b941e920..2714cfc1bfab 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -35,18 +35,18 @@ TMPDIR= ${WRKDIR}/tmp .include <bsd.port.pre.mk> -.if defined(USE_CDROM) +.if defined(WITH_CDROM) .if !exists(/cdrom/linux/office51/setup.zip) IGNORE="Please mount the Sun StarOffice 5.1 CDROM onto /cdrom and run make again." .endif .else # FTP/web download DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} .if !exists(${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make USE_CDROM=yes'" +IGNORE="Please manually download ${DISTNAME}${EXTRACT_SUFX} from http://www.sun.com/staroffice. Put ${DISTNAME}${EXTRACT_SUFX} into the directory ${_DISTDIR} and run make again. Or, if you have the Sun StarOffice 5.1 CDROM, please run 'make WITH_CDROM=yes'" .endif .endif -.if defined(USE_CDROM) +.if defined(WITH_CDROM) do-extract: @${MKDIR} ${WRKSRC}/office51 @cd ${WRKSRC}/office51 && ${LN} -s /cdrom/linux/office51/* . diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 2c64484c4e04..54bb3ba6e94a 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -18,15 +18,15 @@ MAKEFILE= makefile GNU_CONFIGURE= yes MAN1= vile.1 -.if defined(USE_PERL) +.if defined(WITH_PERL) CONFIGURE_ARGS= --with-perl PLIST= ${PKGDIR}/PLIST.perl USE_PERL5= yes .endif pre-configure: -.if ! defined(USE_PERL) - @${ECHO_MSG} "Define USE_PERL if you want to make a vile which includes" +.if ! defined(WITH_PERL) + @${ECHO_MSG} "Define WITH_PERL if you want to make a vile which includes" @${ECHO_MSG} "PERL functionality" .endif @@ -38,7 +38,7 @@ post-install: @if ! [ -d ${PREFIX}/share/vile/macros ]; then ${MKDIR} ${PREFIX}/share/vile/macros; fi ${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/vile/macros ${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/vile/macros -.if defined(USE_PERL) +.if defined(WITH_PERL) ${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile .endif @${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation." diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile index c026c81f4353..a13f4ccec6c8 100644 --- a/editors/xemacs20/Makefile +++ b/editors/xemacs20/Makefile @@ -43,7 +43,7 @@ PLIST_SUB= XEMACS_VER=20.4 XEMACS_ARCH=${XEMACS_ARCH} # Have pre-configure: - @${ECHO_MSG} "To compile in the MULE features, set the environment variable USE_MULE" + @${ECHO_MSG} "To compile in the MULE features, set the environment variable WITH_MULE" .if defined(HAVE_MOTIF) @${ECHO_MSG} "" @${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally" @@ -52,7 +52,7 @@ pre-configure: @${ECHO_MSG} "which will force the use of athena widgets for dialogs." .endif -.if defined(USE_MULE) +.if defined(WITH_MULE) WITH_MULE= --with-mule MULEDISTFILE= ${DISTNAME}-mule.tar.gz PLIST= ${PKGDIR}/PLIST.mule diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index b6395d99e5ef..07a75be66116 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -18,25 +18,24 @@ MAINTAINER= gj@freebsd.org USE_XLIB= yes MAKEFILE= makefile GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-screen=${SCREEN_TYPE} ${WITH_PERL} MAN1= xvile.1 pre-configure: -.if ! defined(USE_MENUS) - @${ECHO_MSG} "To use xvile with menus, set the environment variable USE_MENUS" +.if ! defined(WITH_MENUS) + @${ECHO_MSG} "To use xvile with menus, set the environment variable WITH_MENUS" .endif -.if ! defined(USE_PERL) - @${ECHO_MSG} "To use xvile with PERL, set the environment variable USE_PERL" +.if ! defined(WITH_PERL) + @${ECHO_MSG} "To use xvile with PERL, set the environment variable WITH_PERL" .endif -.if defined(USE_MENUS) -SCREEN_TYPE= Xaw +.if defined(WITH_MENUS) +CONFIGURE_ARGS= --with-screen=Xaw .else -SCREEN_TYPE= x11 +CONFIGURE_ARGS= --with-screen=x11 .endif -.if defined(USE_PERL) -WITH_PERL= --with-perl +.if defined(WITH_PERL) +CONFIGURE_ARGS+= --with-perl PLIST= ${PKGDIR}/PLIST.perl USE_PERL5= yes .endif @@ -49,7 +48,7 @@ post-install: @if ! [ -d ${PREFIX}/share/vile/macros ]; then ${MKDIR} ${PREFIX}/share/vile/macros; fi ${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/vile/macros ${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/vile/macros -.if defined(USE_PERL) +.if defined(WITH_PERL) ${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile .endif @${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation." |