Attachment 125005 Details for Bug 168548 – patch-portupgrade-devel-20120601.txt

[patch] patch-portupgrade-devel-20120601.txt

patch-portupgrade-devel-20120601.txt (text/plain), 2.75 KB, created by Bryan Drewery on 2012-06-02 04:30:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryan Drewery

Created: 2012-06-02 04:30:21 UTC

Size: 2.75 KB

patch

obsolete

>diff --git Makefile Makefile
>index 0b3c35b..0a027d7 100644
>--- Makefile
>+++ Makefile
>@@ -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>
>diff --git distinfo distinfo
>index aca51e5..47724f2 100644
>--- distinfo
>+++ distinfo
>@@ -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
>diff --git pkg-descr pkg-descr
>index e8560e5..a7fd331 100644
>--- pkg-descr
>+++ pkg-descr
>@@ -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
>diff --git pkg-plist pkg-plist
>index 17b077d..4ac5231 100644
>--- pkg-plist
>+++ pkg-plist
>@@ -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

Actions: View | Diff

Attachments on bug 168548: 125005