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.

9 files changed, 60 insertions, 8 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index e4cc0cf..150fafb 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -104,13 +104,13 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 RUBY_VERSION?=		1.7.2
 RUBY_PORT?=		lang/ruby${RUBY_R}-devel
 RUBY_DISTVERSION?=	${RUBY_VERSION:R}-2001.12.25
-RUBY_DISTPATCHVERSION?=	${RUBY_DISTVERSION}-2002.01.26
-RUBY_PORTVERSION?=	${RUBY_VERSION}.2002.01.26
+RUBY_DISTPATCHVERSION?=	${RUBY_DISTVERSION}-2002.01.29
+RUBY_PORTVERSION?=	${RUBY_VERSION}.2002.01.29
 .else
 RUBY_VERSION?=		1.6.6
 RUBY_DISTVERSION?=	${RUBY_VERSION}
-RUBY_DISTPATCHVERSION?=	${RUBY_DISTVERSION}-2002.01.26
-RUBY_PORTVERSION?=	${RUBY_VERSION}.2002.01.26
+RUBY_DISTPATCHVERSION?=	${RUBY_DISTVERSION}-2002.01.29
+RUBY_PORTVERSION?=	${RUBY_VERSION}.2002.01.29
 .endif
 
 RUBY_DEFAULT_VER?=	1.6
diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 15d4342..1b5474c 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/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/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index c5cecf2..5aefc00 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/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
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 238fb7f..3fba2b5 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -58,6 +58,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
@@ -132,6 +134,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/ruby/distinfo b/lang/ruby/distinfo
index a8a0e1e..64b4e39 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.6.6.tar.gz) = 4448a497bde57028be6469f5d5ddf5cf
-MD5 (ruby/ruby-1.6.6-2002.01.26.diff.bz2) = f3965654d4c4e47a6629939c6eabb16c
+MD5 (ruby/ruby-1.6.6-2002.01.29.diff.bz2) = 470b2e854854cfc030da1dea56b4db14
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 238fb7f..3fba2b5 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -58,6 +58,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
@@ -132,6 +134,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/ruby16/distinfo b/lang/ruby16/distinfo
index a8a0e1e..64b4e39 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.6.6.tar.gz) = 4448a497bde57028be6469f5d5ddf5cf
-MD5 (ruby/ruby-1.6.6-2002.01.26.diff.bz2) = f3965654d4c4e47a6629939c6eabb16c
+MD5 (ruby/ruby-1.6.6-2002.01.29.diff.bz2) = 470b2e854854cfc030da1dea56b4db14
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 15d4342..1b5474c 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 c5cecf2..5aefc00 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