Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Oct 2012 13:03:05 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305653 - head/ports-mgmt/portmaster
Message-ID:  <201210101303.q9AD355A031712@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Wed Oct 10 13:03:04 2012
New Revision: 305653
URL: http://svn.freebsd.org/changeset/ports/305653

Log:
  - Move to new home, http://github.com/portmaster
  - Take maintainership
  - Convert to new options framework
  - Use USE_GITHUB for fetching
  - Add DISTNAME to avoid conflict with existing distfile as
    the checksum of the distfile has changed now that it is
    no longer modified for release.
  - Remove use of bsd.port.pre.mk

Modified:
  head/ports-mgmt/portmaster/Makefile
  head/ports-mgmt/portmaster/distinfo
  head/ports-mgmt/portmaster/pkg-descr

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Wed Oct 10 13:02:03 2012	(r305652)
+++ head/ports-mgmt/portmaster/Makefile	Wed Oct 10 13:03:04 2012	(r305653)
@@ -3,55 +3,60 @@
 PORTNAME=	portmaster
 PORTVERSION=	3.14
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://www.c-s.li/ports/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Manage your ports without external databases or languages
 
-OPTIONS=	BASH "Install programmable completions for Bash" off \
-		ZSH "Install programmable completions for zsh" off
+LICENSE=	BSD
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	portmaster
+GH_COMMIT=	31009f6
+GH_TAGNAME=	${GH_COMMIT}
+
+OPTIONS_DEFINE=	BASH ZSH
+BASH_DESC=	Install programmable completions for Bash
+ZSH_DESC=	Install programmable completions for zsh
 
 PLIST_FILES=	sbin/portmaster etc/portmaster.rc.sample
 
 MAN8=		portmaster.8
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_BASH)
+.if ${PORT_OPTIONS:MBASH}
 PLIST_FILES+=	etc/bash_completion.d/portmaster.sh
 PLIST_DIRSTRY+=	etc/bash_completion.d
 .endif
 
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
 PLIST_FILES+=	share/zsh/site-functions/_portmaster
 PLIST_DIRSTRY+=	share/zsh/site-functions share/zsh
 .endif
 
 verify: checksum
-	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
 
 do-build:
-.for file in portmaster.sh portmaster.rc.sample
-	${SED} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/${file}.in \
-	    > ${WRKDIR}/${file}
+.for file in portmaster files/portmaster.rc.sample
+	${SED} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/${file} \
+	  > ${WRKDIR}/${file:T}
 .endfor
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/portmaster.sh ${PREFIX}/sbin/portmaster
+	${INSTALL_SCRIPT} ${WRKDIR}/portmaster ${PREFIX}/sbin/portmaster
 	${INSTALL_DATA} ${WRKDIR}/portmaster.rc.sample ${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/portmaster.8 ${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/files/portmaster.8 ${MAN8PREFIX}/man/man8
 
 post-install:
-.if defined(WITH_BASH)
+.if ${PORT_OPTIONS:MBASH}
 	${MKDIR} ${PREFIX}/etc/bash_completion.d
-	${INSTALL_DATA} ${WRKSRC}/bash-completions \
+	${INSTALL_DATA} ${WRKSRC}/files/bash-completions \
 		${PREFIX}/etc/bash_completion.d/portmaster.sh
 .endif
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/zsh-completions \
+	${INSTALL_DATA} ${WRKSRC}/files/zsh-completions \
 		${PREFIX}/share/zsh/site-functions/_portmaster
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/ports-mgmt/portmaster/distinfo
==============================================================================
--- head/ports-mgmt/portmaster/distinfo	Wed Oct 10 13:02:03 2012	(r305652)
+++ head/ports-mgmt/portmaster/distinfo	Wed Oct 10 13:03:04 2012	(r305653)
@@ -1,4 +1,2 @@
-SHA256 (portmaster-3.14.tar.gz) = 676314bee13a02cc8b6a82df5c5062f80ba96083dfbe3bb90be7e96f05af5d31
-SIZE (portmaster-3.14.tar.gz) = 42062
-SHA256 (portmaster-3.14.tar.gz.asc) = b04e8ff40dac2778403546443fb319a4e2b573714d8ec18e5f8dc085c77e4f5e
-SIZE (portmaster-3.14.tar.gz.asc) = 488
+SHA256 (portmaster-portmaster-3.14-31009f6.tar.gz) = 9029531c486d937c09974baa0174f5a59b5e54c2400ab60caabb09af3add9605
+SIZE (portmaster-portmaster-3.14-31009f6.tar.gz) = 42265

Modified: head/ports-mgmt/portmaster/pkg-descr
==============================================================================
--- head/ports-mgmt/portmaster/pkg-descr	Wed Oct 10 13:02:03 2012	(r305652)
+++ head/ports-mgmt/portmaster/pkg-descr	Wed Oct 10 13:03:04 2012	(r305653)
@@ -18,3 +18,5 @@ Portmaster has the following features:
   * Options to list installed ports by category, and those with new versions
   * Packages can be used for installation either exclusively, if available,
     or only for build dependencies
+
+WWW: http://www.github.com/portmaster/portmaster



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210101303.q9AD355A031712>