diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-06-08 18:18:52 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-06-08 18:18:52 +0000 |
| commit | 187bcf33c1204b92f69bdbde92cc6965be1b3922 (patch) | |
| tree | 25ad77d168aeaca10b9fcafa54a8170c91fd1508 /sysutils | |
| parent | Remove #pragma weak usage. (diff) | |
devel/ruby-fnmatch has been replaced with lang/ruby16-shim-ruby18.
Notes
Notes:
svn path=/head/; revision=60878
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/portupgrade-devel/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/distinfo | 1 | ||||
| -rw-r--r-- | sysutils/portupgrade/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/portupgrade/distinfo | 1 |
4 files changed, 18 insertions, 6 deletions
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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk> 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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk> 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 |