On 2013/11/25 10:02, Antoine Jacoutot wrote:
> On Mon, Nov 25, 2013 at 08:41:53AM +0000, Stuart Henderson wrote:
> > On 2013/11/24 17:01, Amit Kulkarni wrote:
> > > can somebody please add it in the desired place?
> >
> > Is VMEM_WARNING actually useful for anything? I'd rather just remove it.
> > It is currently added ad hoc to ports where the maintainer thinks it uses
> > "a lot of memory" but that isn't really useful without reference to the
> > machine/arch it's built on or information about what that porter thinks
> > is "a lot".
>
> I am all for removing this.
Any objections?
Non-mechanical part of the diff is below; OK? (Boring ~1500-line
diff removing the variable from 92 ports not included but available
on request).
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1247
diff -u -p -r1.1247 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 7 Nov 2013 01:23:19 -0000 1.1247
+++ infrastructure/mk/bsd.port.mk 25 Nov 2013 10:56:29 -0000
@@ -135,7 +135,7 @@ _ALL_VARIABLES += HOMEPAGE DISTNAME \
CONFIGURE_STYLE USE_LIBTOOL SEPARATE_BUILD \
SHARED_LIBS TARGETS PSEUDO_FLAVOR \
MAINTAINER AUTOCONF_VERSION AUTOMAKE_VERSION CONFIGURE_ARGS \
- VMEM_WARNING PKG_ARCH
+ PKG_ARCH
_ALL_VARIABLES_PER_ARCH += BROKEN
# and stuff needing to be MULTI_PACKAGE'd
_ALL_VARIABLES_INDEXED += COMMENT PKGNAME \
@@ -1526,8 +1526,6 @@ MODSIMPLE_configure = \
YACC="${YACC}" \
${CONFIGURE_ENV} ${_CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
-VMEM_WARNING ?= No
-
FAKE_SETUP = TRUEPREFIX=${PREFIX} PREFIX=${WRKINST}${PREFIX} \
${DESTDIRNAME}=${WRKINST}
@@ -2649,19 +2647,6 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
.if ${NO_BUILD:L} == "no"
@${ECHO_MSG} "===> Building for ${FULLPKGNAME}${_MASTER}"
-. if ${VMEM_WARNING:L} == "yes"
- @echo ""; \
- echo "*** WARNING: you may see an error such as"; \
- echo "*** virtual memory exhausted"; \
- echo "*** when building this package. If you do you must increase"; \
- echo "*** your limits. See the man page for your shell and look"; \
- echo "*** for the 'limit' or 'ulimit' command. You may also want to"; \
- echo "*** see the login.conf(5) manual page."; \
- echo "*** Some examples are: "; \
- echo "*** csh(1) and tcsh(1): limit datasize <kbytes of memory>";
\
- echo "*** ksh(1), zsh(1) and bash(1): ulimit -d <kbytes of
memory>"; \
- echo ""
-. endif
. if target(pre-build)
@${_MAKESYS} pre-build
. endif
Index: infrastructure/templates/mk.conf.template
===================================================================
RCS file: /cvs/ports/infrastructure/templates/mk.conf.template,v
retrieving revision 1.11
diff -u -p -r1.11 mk.conf.template
--- infrastructure/templates/mk.conf.template 1 Apr 2013 15:28:47 -0000
1.11
+++ infrastructure/templates/mk.conf.template 25 Nov 2013 10:58:37 -0000
@@ -33,6 +33,7 @@
.poison RUN_DEPEND
.poison SEPERATE_BUILD
.poison SUBIDR
+.poison VMEM_WARNING
.poison WABTLIB
.poison WATNLIB
.poison WKRBUILD
Index: databases/sqlports/Makefile
===================================================================
RCS file: /cvs/ports/databases/sqlports/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- databases/sqlports/Makefile 1 Nov 2013 17:19:18 -0000 1.54
+++ databases/sqlports/Makefile 25 Nov 2013 10:56:29 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.54 2013/11/01 17:19:18 espie Exp $
CATEGORIES = databases
-V = 3.0
+V = 4.0
DISTNAME = sqlports-$V
DISTFILES =
COMMENT = sqlite database of ports
Index: databases/sqlports/files/Info.pm
===================================================================
RCS file: /cvs/ports/databases/sqlports/files/Info.pm,v
retrieving revision 1.11
diff -u -p -r1.11 Info.pm
--- databases/sqlports/files/Info.pm 1 Nov 2013 14:50:11 -0000 1.11
+++ databases/sqlports/files/Info.pm 25 Nov 2013 10:56:29 -0000
@@ -89,7 +89,6 @@ our $vars = {
USE_GMAKE => 'YesNoVar',
USE_GROFF => 'YesNoVar',
USE_LIBTOOL => 'YesNoGnuVar',
- VMEM_WARNING => 'YesNoVar',
WANTLIB => 'WantlibVar',
# XXX those variables are part of the dump for dpb, but really should
# not end up in sqlports. But make sure we know about them.
