From 187bcf33c1204b92f69bdbde92cc6965be1b3922 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Sat, 8 Jun 2002 18:18:52 +0000 Subject: devel/ruby-fnmatch has been replaced with lang/ruby16-shim-ruby18. --- devel/ruby-fnmatch/Makefile | 24 ------------------------ devel/ruby-fnmatch/distinfo | 1 - devel/ruby-fnmatch/pkg-comment | 1 - devel/ruby-fnmatch/pkg-descr | 3 --- devel/ruby-fnmatch/pkg-plist | 1 - lang/ruby16_static/Makefile | 4 ---- lang/ruby18_static/Makefile | 2 -- lang/ruby_static-devel/Makefile | 2 -- lang/ruby_static/Makefile | 4 ---- ports-mgmt/portupgrade-devel/Makefile | 11 ++++++++--- ports-mgmt/portupgrade-devel/distinfo | 1 + ports-mgmt/portupgrade/Makefile | 11 ++++++++--- ports-mgmt/portupgrade/distinfo | 1 + sysutils/portupgrade-devel/Makefile | 11 ++++++++--- sysutils/portupgrade-devel/distinfo | 1 + sysutils/portupgrade/Makefile | 11 ++++++++--- sysutils/portupgrade/distinfo | 1 + 17 files changed, 36 insertions(+), 54 deletions(-) delete mode 100644 devel/ruby-fnmatch/Makefile delete mode 100644 devel/ruby-fnmatch/distinfo delete mode 100644 devel/ruby-fnmatch/pkg-comment delete mode 100644 devel/ruby-fnmatch/pkg-descr delete mode 100644 devel/ruby-fnmatch/pkg-plist diff --git a/devel/ruby-fnmatch/Makefile b/devel/ruby-fnmatch/Makefile deleted file mode 100644 index ae4d17547542..000000000000 --- a/devel/ruby-fnmatch/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: Ruby/fnmatch -# Date created: 11 June 2001 -# Whom: Akinori MUSHA aka knu -# -# $FreeBSD$ -# - -PORTNAME= fnmatch -PORTVERSION= 1.1b -PORTREVISION= 1 -CATEGORIES= devel ruby -MASTER_SITES= http://www.ruby-lang.org/~knu/ -PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} -DISTNAME= ruby-${PORTNAME}-${PORTVERSION} -DIST_SUBDIR= ruby - -MAINTAINER= knu@FreeBSD.org - -USE_RUBY= yes -USE_RUBY_EXTCONF= yes - -INSTALL_TARGET= site-install - -.include diff --git a/devel/ruby-fnmatch/distinfo b/devel/ruby-fnmatch/distinfo deleted file mode 100644 index ecef8e917a7a..000000000000 --- a/devel/ruby-fnmatch/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (ruby/ruby-fnmatch-1.1b.tar.gz) = 03d5f54e76d4f8c3094f8e490659b065 diff --git a/devel/ruby-fnmatch/pkg-comment b/devel/ruby-fnmatch/pkg-comment deleted file mode 100644 index 2d87b442699b..000000000000 --- a/devel/ruby-fnmatch/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A Ruby module which provides File::fnmatch and File::FNM_* diff --git a/devel/ruby-fnmatch/pkg-descr b/devel/ruby-fnmatch/pkg-descr deleted file mode 100644 index 97c558cebf2b..000000000000 --- a/devel/ruby-fnmatch/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a Ruby module which provides File::fnmatch and File::FNM_*. - -Author: Akinori MUSHA diff --git a/devel/ruby-fnmatch/pkg-plist b/devel/ruby-fnmatch/pkg-plist deleted file mode 100644 index 38cbd81c1e7a..000000000000 --- a/devel/ruby-fnmatch/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%RUBY_SITEARCHLIBDIR%%/fnmatch.so diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile index 41840cbd3e20..77914646ae5f 100644 --- a/lang/ruby16_static/Makefile +++ b/lang/ruby16_static/Makefile @@ -26,10 +26,6 @@ EXT_PORTS= archivers/ruby-zlib \ _PORTSDIR= ${.CURDIR}/../.. _RUBY_PORTDIR= ${_PORTSDIR}/${RUBY_PORT} -.if !defined(HAVE_FNMATCH) -EXT_PORTS+= devel/ruby-fnmatch -.endif - .for p in ${EXT_PORTS} BUILD_DEPENDS+= ${NONEXISTENT}:${_PORTSDIR}/${p}:patch .endfor diff --git a/lang/ruby18_static/Makefile b/lang/ruby18_static/Makefile index a36237101560..18e68b14413a 100644 --- a/lang/ruby18_static/Makefile +++ b/lang/ruby18_static/Makefile @@ -9,8 +9,6 @@ MASTERDIR= ${.CURDIR}/../ruby_static RUBY_VER= 1.7 -HAVE_FNMATCH= yes - LATEST_LINK= ruby_static-devel .include "${MASTERDIR}/Makefile" diff --git a/lang/ruby_static-devel/Makefile b/lang/ruby_static-devel/Makefile index a36237101560..18e68b14413a 100644 --- a/lang/ruby_static-devel/Makefile +++ b/lang/ruby_static-devel/Makefile @@ -9,8 +9,6 @@ MASTERDIR= ${.CURDIR}/../ruby_static RUBY_VER= 1.7 -HAVE_FNMATCH= yes - LATEST_LINK= ruby_static-devel .include "${MASTERDIR}/Makefile" diff --git a/lang/ruby_static/Makefile b/lang/ruby_static/Makefile index 41840cbd3e20..77914646ae5f 100644 --- a/lang/ruby_static/Makefile +++ b/lang/ruby_static/Makefile @@ -26,10 +26,6 @@ EXT_PORTS= archivers/ruby-zlib \ _PORTSDIR= ${.CURDIR}/../.. _RUBY_PORTDIR= ${_PORTSDIR}/${RUBY_PORT} -.if !defined(HAVE_FNMATCH) -EXT_PORTS+= devel/ruby-fnmatch -.endif - .for p in ${EXT_PORTS} BUILD_DEPENDS+= ${NONEXISTENT}:${_PORTSDIR}/${p}:patch .endfor diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 530f4f07dd46..ae2ac7dd9add 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -15,13 +15,12 @@ DISTNAME= pkgtools-${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -#PATCHFILES= ${DISTNAME}-yyyymmdd.diff.bz2 +PATCHFILES= ${DISTNAME}-shim.diff.bz2 PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org RUN_DEPENDS= ${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \ - ${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \ ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 \ ${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/sysutils/pkg_tarup # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} @@ -53,9 +52,15 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +.include + +.if ${RUBY_VER} < 1.7 +RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file.so:${PORTSDIR}/lang/ruby16-shim-ruby18 +.endif + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi -.include +.include diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo index aefe27ba6986..002bef55345e 100644 --- a/ports-mgmt/portupgrade-devel/distinfo +++ b/ports-mgmt/portupgrade-devel/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20020429.tar.bz2) = 941033a2e05ef6bc1409fff5442b572e +MD5 (pkgtools-20020429-shim.diff.bz2) = 74c33907968ce5b8cb6ebc6c15498fd8 diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 530f4f07dd46..ae2ac7dd9add 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -15,13 +15,12 @@ DISTNAME= pkgtools-${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -#PATCHFILES= ${DISTNAME}-yyyymmdd.diff.bz2 +PATCHFILES= ${DISTNAME}-shim.diff.bz2 PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org RUN_DEPENDS= ${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \ - ${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \ ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 \ ${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/sysutils/pkg_tarup # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} @@ -53,9 +52,15 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +.include + +.if ${RUBY_VER} < 1.7 +RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file.so:${PORTSDIR}/lang/ruby16-shim-ruby18 +.endif + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi -.include +.include diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index aefe27ba6986..002bef55345e 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20020429.tar.bz2) = 941033a2e05ef6bc1409fff5442b572e +MD5 (pkgtools-20020429-shim.diff.bz2) = 74c33907968ce5b8cb6ebc6c15498fd8 diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index 530f4f07dd46..ae2ac7dd9add 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -15,13 +15,12 @@ DISTNAME= pkgtools-${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -#PATCHFILES= ${DISTNAME}-yyyymmdd.diff.bz2 +PATCHFILES= ${DISTNAME}-shim.diff.bz2 PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org RUN_DEPENDS= ${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \ - ${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \ ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 \ ${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/sysutils/pkg_tarup # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} @@ -53,9 +52,15 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +.include + +.if ${RUBY_VER} < 1.7 +RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file.so:${PORTSDIR}/lang/ruby16-shim-ruby18 +.endif + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi -.include +.include diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index aefe27ba6986..002bef55345e 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20020429.tar.bz2) = 941033a2e05ef6bc1409fff5442b572e +MD5 (pkgtools-20020429-shim.diff.bz2) = 74c33907968ce5b8cb6ebc6c15498fd8 diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index 530f4f07dd46..ae2ac7dd9add 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -15,13 +15,12 @@ DISTNAME= pkgtools-${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -#PATCHFILES= ${DISTNAME}-yyyymmdd.diff.bz2 +PATCHFILES= ${DISTNAME}-shim.diff.bz2 PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org RUN_DEPENDS= ${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \ - ${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \ ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 \ ${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/sysutils/pkg_tarup # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} @@ -53,9 +52,15 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif +.include + +.if ${RUBY_VER} < 1.7 +RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file.so:${PORTSDIR}/lang/ruby16-shim-ruby18 +.endif + post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi -.include +.include diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo index aefe27ba6986..002bef55345e 100644 --- a/sysutils/portupgrade/distinfo +++ b/sysutils/portupgrade/distinfo @@ -1 +1,2 @@ MD5 (pkgtools-20020429.tar.bz2) = 941033a2e05ef6bc1409fff5442b572e +MD5 (pkgtools-20020429-shim.diff.bz2) = 74c33907968ce5b8cb6ebc6c15498fd8 -- cgit v1.2.3