1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Port changes

- Convert to new options framework
- Sync pkg-message with devel/portupgrade
portupgrade changes
- portupgrade/portinstall -v now lists recursive depends [ports/137958]
- portupgrade lists new version after upgrade in results
- Fixed failure being seen as success due to broken script(1) [ports/147242,
  ports/131111]
- A fixed script(1) is now included for systems < 8.1
- Expanded pkgng support

PR:		ports/168548 which fixes: ports/137958 ports/147242 ports/131111
Submitted by:	Bryan Drewery <bryan@shatow.net>
This commit is contained in:
Baptiste Daroussin 2012-06-02 09:48:44 +00:00
parent 403efe08e0
commit 24b247e2c7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=298002
4 changed files with 20 additions and 8 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= portupgrade
PORTVERSION= 20120512
PORTVERSION= 20120601
PORTEPOCH= 3
CATEGORIES= ports-mgmt
MASTER_SITES= http://github.com/pkgtools/pkgtools/tarball/${GITVERSION}/ \
@ -24,7 +24,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
CONFLICTS_INSTALL= portupgrade-[0-9]*
FETCH_ARGS= -Fpr
GITVERSION= 6b51331
GITVERSION= 0529f13
USE_RUBY= yes
USE_LDCONFIG= ${PREFIX}/lib/compat/pkg
@ -49,11 +49,21 @@ MANCOMPRESSED= maybe
EXAMPLESDIR= ${PREFIX}/share/examples/pkgtools
DOCSDIR= ${PREFIX}/share/doc/pkgtools
.include <bsd.port.pre.mk>
INSTALL_TARGET= install
.if !defined(NOPORTDOCS)
.if ${PORT_OPTIONS:MDOCS}
INSTALL_TARGET+= install-doc
.endif
# Need to install working script(1)
.if ${OSVERSION} < 801000
PLIST_SUB+= SCRIPT=""
MAKE_ENV+= NEED_COMPAT_SCRIPT=yes
.else
PLIST_SUB+= SCRIPT="@comment "
.endif
post-patch: .SILENT
REVISION=`readlink "${_DISTDIR}/portupgrade/latest" | ${SED} -E -e 's,.*pkgtools-(.*).tar.gz,\1,g'` && ${SED} -E -e "s,%%DATE%%,${PORTVERSION},g;s,%%REVISION%%,$${REVISION},g" \
${WRKSRC}/lib/pkgtools/revision.rb.in > ${WRKSRC}/lib/pkgtools/revision.rb
@ -64,4 +74,4 @@ post-install:
fi
${MKDIR} ${PREFIX}/lib/compat/pkg
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pkgtools-pkgtools-6b51331.tar.gz) = d0be31170740d66a416b621a9d773130a0934b5babb1746ef514831285063000
SIZE (pkgtools-pkgtools-6b51331.tar.gz) = 101335
SHA256 (pkgtools-pkgtools-0529f13.tar.gz) = 6b610e83b69e843e7331e3c7df71da777b036b50a46e16435ae986881132b87b
SIZE (pkgtools-pkgtools-0529f13.tar.gz) = 104069

View File

@ -19,6 +19,5 @@ pkg_which: Checks which package a file came from quickly.
pkgdb: Manages and searches the package database.
pkgdu: Display a disk usage for installed packages.
Author: Akinori MUSHA <knu@FreeBSD.org> (Not the current maintainer)
Maintainer: freebsd-ruby mailing list <ruby@FreeBSD.org>
WWW: http://pkgtools.github.com/
WWW: http://wiki.freebsd.org/portupgrade

View File

@ -32,6 +32,9 @@ sbin/portversion
@dirrmtry %%RUBY_SITELIBDIR%%
@dirrmtry lib/ruby/site_ruby
@dirrmtry lib/ruby
%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null
%%SCRIPT%%libexec/pkgtools/script
%%SCRIPT%%@dirrm libexec/pkgtools
@unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
etc/pkgtools.conf.sample
@exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf