diff options
author | Akinori MUSHA <knu@FreeBSD.org> | 2002-01-29 09:14:09 +0000 |
---|---|---|
committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-01-29 09:14:09 +0000 |
commit | 29ab188f02685b2100a6ea8e8b013aa28300f68e (patch) | |
tree | 948c5cf7d94f222307c89ddfd4b68722941a8591 /lang/ruby18 | |
parent | Add missed continue statement. (diff) |
To keep users from experiencing upgrading problems, make lang/ruby and
lang/ruby-devel deinstall obsoleted (integrated) packages in their
post-install targets (for installation from ports) and in their plists
(for installation from packages),
Update to the latest snapshot as of 2002-01-29 while I'm at it.
Notes
Notes:
svn path=/head/; revision=53945
Diffstat (limited to 'lang/ruby18')
-rw-r--r-- | lang/ruby18/Makefile | 13 | ||||
-rw-r--r-- | lang/ruby18/distinfo | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index 15d4342a90b6..1b5474c6a264 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -62,6 +62,8 @@ PLIST_SUB+= IF_DEFAULT=${IF_DEFAULT} \ IRB_WITHOUT_SUFFIX= ${LOCALBASE}/bin/irb IRB_WITH_SUFFIX= ${IRB_WITHOUT_SUFFIX}${_RUBY_SUFFIX} +OBSOLETED_MODULES= sha1 shell syslog timex urb uri + post-patch: find ${WRKSRC} -name '*.orig' -delete .for d in Win32API @@ -136,6 +138,17 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}/syslog ${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/ .endif + @${ECHO} "Deinstalling obsoleted packages that are now part of ruby..." + @cd ${PKG_DBDIR}; for portname in ${OBSOLETED_MODULES}; do \ + for pkg in ${RUBY_PKGNAMEPREFIX}$$portname-*; do \ + if [ -d $$pkg ]; then \ + ${ECHO} "---> $$pkg"; \ + ${PKG_DELETE} -f $$pkg; \ + fi; \ + done; \ + done + @${ECHO_CMD} "@exec ${ECHO_CMD} \"Deinstalling obsoleted packages that are now part of ruby...\"" >> ${TMPPLIST} + @${ECHO_CMD} "@exec cd ${PKG_DBDIR} && for portname in ${OBSOLETED_MODULES}; do for pkg in ${RUBY_PKGNAMEPREFIX}\$$portname-*; do if [ -d \$$pkg ]; then ${ECHO_CMD} \"---> \$$pkg\"; ${PKG_DELETE} -f \$$pkg; fi; done; done" >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} test: diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo index c5cecf2f9d1b..5aefc0075bc1 100644 --- a/lang/ruby18/distinfo +++ b/lang/ruby18/distinfo @@ -1,2 +1,2 @@ MD5 (ruby/ruby-1.7-2001.12.25.tar.bz2) = 06142a99afe4f876f2cef8d2abe59302 -MD5 (ruby/ruby-1.7-2001.12.25-2002.01.26.diff.bz2) = d1b085bd72599676446cf33fc039c4ed +MD5 (ruby/ruby-1.7-2001.12.25-2002.01.29.diff.bz2) = 0b42558158220b3a40ef73c9b8711fd6 |