Date: Mon, 27 Feb 2012 22:00:26 GMT From: =?unknown-8bit?B?SMWNa2Fu?= <hokan@me.umn.edu> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/165430: [maintainer update] port sysutils/modules upgrade Message-ID: <201202272200.q1RM0QWp001899@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/165430; it has been noted by GNATS.
From: =?unknown-8bit?B?SMWNa2Fu?= <hokan@me.umn.edu>
To: Michael Scheidell <scheidell@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/165430: [maintainer update] port sysutils/modules upgrade
Date: Mon, 27 Feb 2012 15:50:41 -0600
--UlVJffcvxoiEqYs2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Sorry for the trouble. I hope this is better...
On Mon, Feb 27, 2012 at 04:38:28PM -0500, Michael Scheidell wrote:
> Thank you for your work in keeping freebsd ports tree updates, and
> your work on your port, sysutils/modules.
>
> This patch was not sent as an attachment, and got mangled.
> (see the web site url below)
> is there anyway you can try to upload the patch, as an attachment,
> back to GNATS via this pr?
> If you use 'send-pr', you could have used the '-a' (attachment) option.
>
> the problem with it now, it there is no easy way to distinguish
> white space from tabs from whitespace.
>
> The committer would need to 'copy' and paste the portion on the web
> site, and try to edit them by hand, and that can give rise to
> errors.
--
Hokan MEnet, a wholly owned subsidiary of Enet
System Administrator Department of Mechanical Engineering
hokan@me.umn.edu College of Science and Engineering
612.626.9800 University of Minnesota
--UlVJffcvxoiEqYs2
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="upgrade-modules.diff"
Only in /usr/ports/sysutils/modules: CVS
diff -u /usr/ports/sysutils/modules/Makefile modules/Makefile
--- /usr/ports/sysutils/modules/Makefile 2009-08-21 19:35:22.000000000 -0500
+++ modules/Makefile 2012-02-23 14:44:51.000000000 -0600
@@ -6,38 +6,44 @@
#
PORTNAME= modules
-PORTVERSION= 3.1.6
+PORTVERSION= 3.2.9
+DISTVERSIONSUFFIX= c
CATEGORIES= sysutils tcl
MASTER_SITES= SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}
+WRKSRC= work/${PORTNAME}-${PORTVERSION}
MAINTAINER= hokan@me.umn.edu
COMMENT= Dynamic modification of a user's environment
-LIB_DEPENDS= tcl${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER}
+LICENSE= GPLv2
PLIST_SUB= MODULES_VERSION=${PORTVERSION}
BINDIR= ${PREFIX}/Modules
-TCL_DVER?= 8.4
-TCL_VER= ${TCL_DVER:S/.//}
+USE_AUTOTOOLS= automake
+AUTOMAKE_VERSION= 1.11
+USE_TCL_WRAPPER= yes
+USE_TCL= yes
+USE_GMAKE= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}/Modules/@VERSION@ \
- --without-x \
+CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-version-path=${PREFIX}/Modules/versions \
- --mandir=${MANPREFIX}/man \
- --with-tcl-version=${TCL_VER} \
- --with-tcl-include=${LOCALBASE}/include/tcl${TCL_DVER} \
- --with-tcl-libraries=${LOCALBASE}/lib/
+ --mandir=${MANPREFIX}/man
MAN1= module.1
MAN5= modulefile.5
post-extract:
${MV} ${WRKSRC}/doc/modulefile.4.in ${WRKSRC}/doc/modulefile.5.in
-
+post-patch:
+ @${FIND} ${WRKSRC} -type f -exec fgrep -l 'man4' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,man4,man5,g' -i .bak
+ @${FIND} ${WRKSRC} -type f -exec fgrep -l 'modulefile.4' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,modulefile.4,modulefile.5,g' -i .bak
+ @${FIND} ${WRKSRC} -type f -exec fgrep -l 'modulefile 4' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,modulefile 4,modulefile 5,g' -i .bak
+
pre-install:
${MKDIR} ${PREFIX}/Modules
+ ${LN} -s ${PREFIX}/Modules/${PORTVERSION} ${PREFIX}/Modules/default
.include <bsd.port.mk>
diff -u /usr/ports/sysutils/modules/distinfo modules/distinfo
--- /usr/ports/sysutils/modules/distinfo 2011-03-19 07:32:53.000000000 -0500
+++ modules/distinfo 2012-02-21 16:57:04.000000000 -0600
@@ -1,2 +1,2 @@
-SHA256 (modules-3.1.6.tar.gz) = a65dd5c66a42558ba77f7b6343ecaeebc00c8501408313a1c1cf7fcca2a61bcb
-SIZE (modules-3.1.6.tar.gz) = 420885
+SHA256 (modules-3.2.9c.tar.gz) = f0d90d1cd031109c5dedb1b3465d1e1b49fa45bebb6587105757cae735804f95
+SIZE (modules-3.2.9c.tar.gz) = 439742
Only in /usr/ports/sysutils/modules: files
diff -u /usr/ports/sysutils/modules/pkg-plist modules/pkg-plist
--- /usr/ports/sysutils/modules/pkg-plist 2005-03-11 03:33:12.000000000 -0600
+++ modules/pkg-plist 2012-02-21 16:57:04.000000000 -0600
@@ -1,12 +1,16 @@
+Modules/default
Modules/%%MODULES_VERSION%%/bin/add.modules
Modules/%%MODULES_VERSION%%/bin/mkroot
Modules/%%MODULES_VERSION%%/bin/modulecmd
Modules/%%MODULES_VERSION%%/init/.modulespath
Modules/%%MODULES_VERSION%%/init/bash
+Modules/%%MODULES_VERSION%%/init/bash_completion
+Modules/%%MODULES_VERSION%%/init/cmake
Modules/%%MODULES_VERSION%%/init/csh
Modules/%%MODULES_VERSION%%/init/ksh
-Modules/%%MODULES_VERSION%%/init/perl
-Modules/%%MODULES_VERSION%%/init/python
+Modules/%%MODULES_VERSION%%/init/perl.pm
+Modules/%%MODULES_VERSION%%/init/python.py
+Modules/%%MODULES_VERSION%%/init/ruby.rb
Modules/%%MODULES_VERSION%%/init/sh
Modules/%%MODULES_VERSION%%/init/tcsh
Modules/%%MODULES_VERSION%%/init/zsh
--UlVJffcvxoiEqYs2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202272200.q1RM0QWp001899>