diff options
| author | bapt <bapt@FreeBSD.org> | 2012-06-02 09:48:44 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2012-06-02 09:48:44 +0000 |
| commit | 54d6ed8f9c0e72aa995fdc00ddcb3c020eb39651 (patch) | |
| tree | bba1b04915b29d2f6ff9811bb10cf84140999413 /ports-mgmt/portupgrade-devel/Makefile | |
| parent | c7ad2a7fa75d0e414a47c8277b567f72f3d238b4 (diff) | |
| download | FreeBSD-ports-54d6ed8f9c0e72aa995fdc00ddcb3c020eb39651.zip FreeBSD-ports-54d6ed8f9c0e72aa995fdc00ddcb3c020eb39651.tar.gz | |
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>
Diffstat (limited to 'ports-mgmt/portupgrade-devel/Makefile')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index db2263f..753a564 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/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> |
