aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2002-01-29 09:14:09 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2002-01-29 09:14:09 +0000
commit29ab188f02685b2100a6ea8e8b013aa28300f68e (patch)
tree948c5cf7d94f222307c89ddfd4b68722941a8591 /lang
parent30205df2d5ab424dab157ae456e6d894026f8810 (diff)
downloadports-29ab188f02685b2100a6ea8e8b013aa28300f68e.tar.gz
ports-29ab188f02685b2100a6ea8e8b013aa28300f68e.zip
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')
-rw-r--r--lang/ruby-devel/Makefile13
-rw-r--r--lang/ruby-devel/distinfo2
-rw-r--r--lang/ruby/Makefile13
-rw-r--r--lang/ruby/distinfo2
-rw-r--r--lang/ruby16/Makefile13
-rw-r--r--lang/ruby16/distinfo2
-rw-r--r--lang/ruby18/Makefile13
-rw-r--r--lang/ruby18/distinfo2
8 files changed, 56 insertions, 4 deletions
diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 15d4342a90b6..1b5474c6a264 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 c5cecf2f9d1b..5aefc0075bc1 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 238fb7f49964..3fba2b594e1f 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 a8a0e1ed6c7e..64b4e39cfe71 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 238fb7f49964..3fba2b594e1f 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 a8a0e1ed6c7e..64b4e39cfe71 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 13:27:47 +0000