Date: Sat, 28 Jan 2006 03:37:57 GMT From: Mark Linimon <linimon@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92443: [patch] remove .error from all port Makefiles Message-ID: <200601280337.k0S3bvQR064382@freefall.freebsd.org> Resent-Message-ID: <200601280340.k0S3e2dt064452@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92443
>Category: ports
>Synopsis: [patch] remove .error from all port Makefiles
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 28 03:40:02 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Mark Linimon
>Release: FreeBSD 6.0-STABLE i386
>Organization:
FreeBSD
>Environment:
>Description:
The use of .error in port Makefiles has been discouraged for some time
as it introduces fragility into the 'make index' process. This patch
removes the last vestiges from the various port Makefiles.
>How-To-Repeat:
>Fix:
Index: archivers/bzip2/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/archivers/bzip2/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- archivers/bzip2/Makefile 20 Oct 2005 10:01:04 -0000 1.41
+++ archivers/bzip2/Makefile 27 Jan 2006 05:50:13 -0000
@@ -26,7 +26,7 @@
bzmore.1 bzless.1
.ifdef USE_BZIP2
-.error You have `USE_BZIP2' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= cannot install: you have the `USE_BZIP2' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
do-install:
Index: archivers/unzip/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/archivers/unzip/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- archivers/unzip/Makefile 9 Sep 2005 18:33:17 -0000 1.52
+++ archivers/unzip/Makefile 27 Jan 2006 05:50:59 -0000
@@ -28,7 +28,7 @@
.endif
.ifdef USE_UNZIP
-.error You have `USE_UNZIP' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= cannot install: you have the `USE_UNZIP' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.include <bsd.port.pre.mk>
Index: converters/libiconv/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/converters/libiconv/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- converters/libiconv/Makefile 15 Nov 2005 06:48:15 -0000 1.34
+++ converters/libiconv/Makefile 27 Jan 2006 05:51:33 -0000
@@ -27,7 +27,7 @@
MAN3= iconv.3 iconv_open.3 iconv_close.3
.ifdef USE_ICONV
-.error USE_ICONV is defined as an environment variable, or in the arguments \
+IGNORE= cannot install: USE_ICONV is defined as an environment variable, or in the arguments \
to "make". Please unset it and restart the build.
.endif
Index: databases/mysql323-server/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/databases/mysql323-server/Makefile,v
retrieving revision 1.186
diff -u -r1.186 Makefile
--- databases/mysql323-server/Makefile 12 Jan 2006 08:57:42 -0000 1.186
+++ databases/mysql323-server/Makefile 27 Jan 2006 05:52:42 -0000
@@ -31,7 +31,7 @@
--enable-thread-safe-client
.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= cannot install: you have the `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
Index: databases/mysql40-server/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/databases/mysql40-server/Makefile,v
retrieving revision 1.202
diff -u -r1.202 Makefile
--- databases/mysql40-server/Makefile 12 Jan 2006 08:57:43 -0000 1.202
+++ databases/mysql40-server/Makefile 27 Jan 2006 05:54:26 -0000
@@ -34,7 +34,7 @@
--enable-thread-safe-client
.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= cannot install: you have the `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
Index: databases/mysql41-server/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/databases/mysql41-server/Makefile,v
retrieving revision 1.214
diff -u -r1.214 Makefile
--- databases/mysql41-server/Makefile 12 Jan 2006 08:47:22 -0000 1.214
+++ databases/mysql41-server/Makefile 27 Jan 2006 05:53:59 -0000
@@ -35,7 +35,7 @@
--enable-thread-safe-client
.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= cannot install: you have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
Index: databases/mysql50-server/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/databases/mysql50-server/Makefile,v
retrieving revision 1.206
diff -u -r1.206 Makefile
--- databases/mysql50-server/Makefile 11 Jan 2006 07:16:20 -0000 1.206
+++ databases/mysql50-server/Makefile 27 Jan 2006 05:56:40 -0000
@@ -34,7 +34,7 @@
--enable-thread-safe-client
.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= cannot install: you have the `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
Index: devel/bison/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/devel/bison/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- devel/bison/Makefile 4 Sep 2005 18:33:15 -0000 1.54
+++ devel/bison/Makefile 27 Jan 2006 06:36:55 -0000
@@ -40,7 +40,7 @@
.endif
.ifdef USE_BISON
-.error You have `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have the `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
post-extract:
Index: devel/bison2/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/devel/bison2/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- devel/bison2/Makefile 18 Nov 2005 04:03:37 -0000 1.57
+++ devel/bison2/Makefile 27 Jan 2006 06:37:38 -0000
@@ -40,7 +40,7 @@
.endif
.ifdef USE_BISON
-.error You have `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
post-extract:
Index: devel/gettext/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/devel/gettext/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- devel/gettext/Makefile 15 Nov 2005 06:48:41 -0000 1.72
+++ devel/gettext/Makefile 27 Jan 2006 06:38:48 -0000
@@ -54,8 +54,8 @@
INFO= autosprintf gettext
.ifdef USE_GETTEXT
-.error USE_GETTEXT is defined as an environment variable, or in the arguments \
- to "make". Please unset it and restart the build.
+IGNORE= Cannot install: USE_GETTEXT is defined as an environment variable, or in the arguments \
+ to "make". Please unset it and restart the build
.endif
.include <bsd.port.pre.mk>
Index: devel/gmake/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/devel/gmake/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- devel/gmake/Makefile 14 Oct 2004 20:45:42 -0000 1.60
+++ devel/gmake/Makefile 27 Jan 2006 06:39:36 -0000
@@ -35,7 +35,7 @@
INFO= make
.ifdef USE_GMAKE
-.error You have `USE_GMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have the `USE_GMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
post-patch:
Index: devel/imake-4/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/devel/imake-4/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- devel/imake-4/Makefile 25 Nov 2005 12:10:56 -0000 1.37
+++ devel/imake-4/Makefile 27 Jan 2006 06:40:31 -0000
@@ -26,7 +26,7 @@
SCRIPTS_ENV= CC=${CC}
.ifdef USE_IMAKE
-.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have the `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.include <bsd.port.pre.mk>
Index: devel/imake-6/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/devel/imake-6/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- devel/imake-6/Makefile 21 Jan 2006 18:55:02 -0000 1.10
+++ devel/imake-6/Makefile 27 Jan 2006 06:42:29 -0000
@@ -25,7 +25,7 @@
SCRIPTS_ENV= CC=${CC}
.ifdef USE_IMAKE
-.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have the `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.include <bsd.port.pre.mk>
Index: dns/fastresolve/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/dns/fastresolve/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- dns/fastresolve/Makefile 15 Nov 2005 06:49:06 -0000 1.15
+++ dns/fastresolve/Makefile 27 Jan 2006 06:45:58 -0000
@@ -44,7 +44,7 @@
LIB_DEPENDS+= db-4.3:${PORTSDIR}/databases/db43
CONFIGURE_ARGS= --with-bdb-lib=-ldb_cxx-4.3 --with-bdb-incdir=${LOCALBASE}/include/db43
.else
-.error WITH_BDB_VER must be one between 3, 4, 41, 42 or 43
+IGNORE= Cannot install: WITH_BDB_VER must be one of 3, 4, 41, 42 or 43
.endif
MAN1= dns-terror.1 btree-dump.1 convert-dom-db.1 convert-ip-db.1 \
Index: editors/mode-info/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/editors/mode-info/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- editors/mode-info/Makefile 20 Apr 2005 13:48:17 -0000 1.10
+++ editors/mode-info/Makefile 27 Jan 2006 06:47:49 -0000
@@ -26,7 +26,7 @@
BUILD_DEPENDS+= ${LOCALBASE}/info/elisp-ja.info:${PORTSDIR}/japanese/elisp-manual
RUN_DEPENDS+= ${LOCALBASE}/info/elisp-ja.info:${PORTSDIR}/japanese/elisp-manual
.else
-.error MI_ELISP_LANG should be "en" or "ja".
+IGNORE= Cannot install: MI_ELISP_LANG should be "en" or "ja"
.endif
MI_INDEX+= mi-elisp.idx
PLIST_SUB+= MI_WITH_ELISP=""
Index: emulators/xmame/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/emulators/xmame/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- emulators/xmame/Makefile 7 Dec 2005 09:38:04 -0000 1.99
+++ emulators/xmame/Makefile 27 Jan 2006 06:49:35 -0000
@@ -63,7 +63,7 @@
.if ${MAMEMESS} == "mess"
PLIST_SUB+= MAMEONLY="@comment " MESSONLY=""
.else
-.error MAMEMESS must be set to one of "mame" or "mess".
+IGNORE= Cannot install: MAMEMESS must be set to one of "mame" or "mess"
.endif
.endif
Index: japanese/skkinput/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/japanese/skkinput/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- japanese/skkinput/Makefile 3 May 2005 09:33:32 -0000 1.16
+++ japanese/skkinput/Makefile 27 Jan 2006 06:52:02 -0000
@@ -23,7 +23,7 @@
# sanity check
.if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV)
-.error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously.
+IGNORE= Cannot install: you cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously
.endif
.if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV)
Index: japanese/skkinput3/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/japanese/skkinput3/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- japanese/skkinput3/Makefile 3 May 2005 09:33:32 -0000 1.15
+++ japanese/skkinput3/Makefile 27 Jan 2006 06:52:40 -0000
@@ -29,7 +29,7 @@
# sanity check
.if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV)
-.error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously.
+IGNORE= Cannot install: you cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously
.endif
.if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV)
Index: lang/gdc/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/lang/gdc/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- lang/gdc/Makefile 4 Dec 2005 18:09:12 -0000 1.18
+++ lang/gdc/Makefile 27 Jan 2006 06:57:58 -0000
@@ -45,7 +45,7 @@
.ifndef TARGET_GCC
TARGET_GCC= 3.4 # default
.elif ${TARGET_GCC} != 3.4 && ${TARGET_GCC} != 4.0
-.error it cannot be specified as TARGET_GCC other than 3.4 or 4.0
+IGNORE= Cannot install: you cannot specifie TARGET_GCC other than 3.4 or 4.0
.endif
.if ${TARGET_GCC} == 4.0
Index: lang/perl5/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/lang/perl5/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- lang/perl5/Makefile 10 Oct 2005 15:38:15 -0000 1.69
+++ lang/perl5/Makefile 27 Jan 2006 06:57:50 -0000
@@ -81,7 +81,7 @@
.endif
.ifdef USE_PERL5
-.error You have `USE_PERL5' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have the `USE_PERL5' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
NO_LATEST_LINK= yes
Index: mail/exim/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/mail/exim/Makefile,v
retrieving revision 1.213
diff -u -r1.213 Makefile
--- mail/exim/Makefile 7 Jan 2006 22:48:20 -0000 1.213
+++ mail/exim/Makefile 27 Jan 2006 06:58:42 -0000
@@ -537,7 +537,7 @@
.include <bsd.port.pre.mk>
.if defined(EXIMON_ONLY) && ${MASTERDIR} == ${PKGDIR}
-.error EXIMON_ONLY is not user settable
+IGNORE= Cannot install: EXIMON_ONLY is not user settable
.endif
.if !defined(EXIMON_ONLY) && !defined(WITHOUT_DAEMON)
Index: mail/lmtpd/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/mail/lmtpd/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- mail/lmtpd/Makefile 14 Sep 2005 18:17:14 -0000 1.18
+++ mail/lmtpd/Makefile 27 Jan 2006 06:59:18 -0000
@@ -28,7 +28,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_DB3) && defined(WITH_DB4)
-.error You cannot use DB3 and DB4 in the same time.
+IGNORE= Cannot install: you cannot use DB3 and DB4 in the same time
.endif
.if defined(WITH_PCRE)
Index: mail/mutt/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/mail/mutt/Makefile,v
retrieving revision 1.169
diff -u -r1.169 Makefile
--- mail/mutt/Makefile 15 Nov 2005 06:50:01 -0000 1.169
+++ mail/mutt/Makefile 27 Jan 2006 07:02:28 -0000
@@ -49,8 +49,8 @@
USE_GETTEXT= yes
USE_ICONV= yes
.if defined(WITHOUT_MUTT_ICONV)
-.error the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
- WITHOUT_NLS is also given
+IGNORE= Cannot install: the WITHOUT_MUTT_ICONV knob of the mutt port only \
+ works if WITHOUT_NLS is also given
.endif
.elif !defined(WITHOUT_MUTT_ICONV)
USE_ICONV= yes
Index: mail/mutt-devel/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/mail/mutt-devel/Makefile,v
retrieving revision 1.260
diff -u -r1.260 Makefile
--- mail/mutt-devel/Makefile 15 Nov 2005 06:50:01 -0000 1.260
+++ mail/mutt-devel/Makefile 27 Jan 2006 07:00:18 -0000
@@ -180,14 +180,14 @@
WITH_MUTT_IMAP_HEADER_CACHE= yes
.endif
.if defined(WITH_MUTT_SIGNATURE_MENU)
-.error The WITH_MUTT_SIGNATURE_MENU does not work at the moment
+IGNORE= Cannot install: the WITH_MUTT_SIGNATURE_MENU does not work at the moment
.endif
.if defined(WITH_MUTT_SIDEBAR_PATCH)
.if defined(WITH_MUTT_NNTP)
-.error The WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
+IGNORE= Cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
.endif
.if defined(WITH_MUTT_SIGNATURE_MENU)
-.error The WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_SIGNATURE_MENU are not compatible
+IGNORE= Cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_SIGNATURE_MENU are not compatible
.endif
.endif
Index: misc/libhome/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/misc/libhome/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- misc/libhome/Makefile 15 Nov 2005 06:50:09 -0000 1.13
+++ misc/libhome/Makefile 27 Jan 2006 07:06:11 -0000
@@ -28,7 +28,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_DB3) && defined(WITH_DB4)
-.error You cannot use DB3 and DB4 in the same time.
+IGNORE= Cannot install: you cannot use DB3 and DB4 at the same time
.endif
CONFIGURE_ARGS+= --with-proxy --with-nss
Index: net/mldonkey/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/net/mldonkey/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- net/mldonkey/Makefile 14 Jan 2006 09:22:04 -0000 1.32
+++ net/mldonkey/Makefile 27 Jan 2006 07:08:08 -0000
@@ -37,7 +37,7 @@
.if defined(WITHOUT_GUI)
.if defined(WITHOUT_CORE)
-.error "Cool, you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing."
+IGNORE= Cannot install: you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing
.endif
# have no 'without-' flag
CONFIGURE_ARGS+=--disable-gui
Index: net/mldonkey-devel/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/net/mldonkey-devel/Makefile,v
retrieving revision 1.66
diff -u -r1.66 Makefile
--- net/mldonkey-devel/Makefile 19 Jan 2006 23:05:38 -0000 1.66
+++ net/mldonkey-devel/Makefile 27 Jan 2006 07:07:08 -0000
@@ -44,7 +44,7 @@
###
.if defined(WITHOUT_GUI)
.if defined(WITHOUT_CORE)
-.error "Cool, you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing."
+IGNORE= Cannot install: you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing
.endif
# have no 'without-' flag
CONFIGURE_ARGS+=--disable-gui \
Index: security/openssl/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/security/openssl/Makefile,v
retrieving revision 1.112
diff -u -r1.112 Makefile
--- security/openssl/Makefile 25 Dec 2005 16:37:12 -0000 1.112
+++ security/openssl/Makefile 27 Jan 2006 07:12:30 -0000
@@ -39,7 +39,7 @@
COMMENT= SSL and crypto library
.ifdef USE_OPENSSL
-.error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have the `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.if defined(WITH_OPENSSL_SNAPSHOT)
Index: textproc/redland/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/textproc/redland/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- textproc/redland/Makefile 15 Nov 2005 06:51:23 -0000 1.25
+++ textproc/redland/Makefile 27 Jan 2006 07:13:52 -0000
@@ -32,7 +32,7 @@
.elif ${WITH_BDB_VER} == 43
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
.else
-.error WITH_BDB_VER must be one of 3, 4, 41, 42 or 43
+IGNORE= Cannot install: WITH_BDB_VER must be one of 3, 4, 41, 42 or 43
.endif
USE_GNOME= gnomehack gnometarget lthack pkgconfig
Index: x11/XFree86/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/x11/XFree86/Makefile,v
retrieving revision 1.106
diff -u -r1.106 Makefile
--- x11/XFree86/Makefile 12 Apr 2005 03:26:45 -0000 1.106
+++ x11/XFree86/Makefile 27 Jan 2006 07:18:40 -0000
@@ -46,7 +46,7 @@
.endif
.ifdef USE_XLIB
-.error You have `USE_XLIB' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have `USE_XLIB' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
Index: x11/XFree86-4-libraries/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/x11/XFree86-4-libraries/Makefile,v
retrieving revision 1.149
diff -u -r1.149 Makefile
--- x11/XFree86-4-libraries/Makefile 11 Nov 2005 22:16:11 -0000 1.149
+++ x11/XFree86-4-libraries/Makefile 27 Jan 2006 07:17:35 -0000
@@ -100,7 +100,7 @@
# End of XFree86 User Config
.ifdef USE_XLIB
-.error You have `USE_XLIB' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have `USE_XLIB' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.include "Makefile.inc"
Index: x11-toolkits/open-motif/Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/x11-toolkits/open-motif/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- x11-toolkits/open-motif/Makefile 1 Jun 2005 16:02:04 -0000 1.38
+++ x11-toolkits/open-motif/Makefile 27 Jan 2006 07:21:10 -0000
@@ -33,7 +33,7 @@
DEMOS_SRC= ${WRKSRC}/demos/programs
.ifdef USE_MOTIF
-.error You have `USE_MOTIF' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+IGNORE= Cannot install: you have the `USE_MOTIF' variable defined either in environment or in make(1) arguments. Please undefine and try again
.endif
.if defined(WITH_JDK_PATCH)
@@ -44,7 +44,7 @@
.if exists(${WITH_JDK_PATCH})
EXTRA_PATCHES+= ${WITH_JDK_PATCH}
.else
-.error "wrong WITH_JDK_PATCH value"
+IGNORE= Cannot install: wrong WITH_JDK_PATCH value
.endif
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601280337.k0S3bvQR064382>