From owner-svn-ports-head@FreeBSD.ORG  Sun Jul 28 12:26:15 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BCCF2CF9;
 Sun, 28 Jul 2013 12:26:15 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 90B212B21;
 Sun, 28 Jul 2013 12:26:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6SCQFwF041387;
 Sun, 28 Jul 2013 12:26:15 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6SCQFN9041382;
 Sun, 28 Jul 2013 12:26:15 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307281226.r6SCQFN9041382@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sun, 28 Jul 2013 12:26:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323823 - head/multimedia/tstools
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jul 2013 12:26:15 -0000

Author: danfe
Date: Sun Jul 28 12:26:14 2013
New Revision: 323823
URL: http://svnweb.freebsd.org/changeset/ports/323823

Log:
  - Switch to SourceForge as BerliOS does not seem to work
  - Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS, define LICENSE
  - Respect user's CC and CFLAGS
  - Generally clean up Makefile prior to making it jobs-safe

Modified:
  head/multimedia/tstools/Makefile
  head/multimedia/tstools/pkg-plist

Modified: head/multimedia/tstools/Makefile
==============================================================================
--- head/multimedia/tstools/Makefile	Sun Jul 28 12:18:05 2013	(r323822)
+++ head/multimedia/tstools/Makefile	Sun Jul 28 12:26:14 2013	(r323823)
@@ -1,34 +1,35 @@
-# New ports collection makefile for:	tstools
-# Date created:		2009 January 12
-# Whom:			J.R. Oldroyd <fbsd@opal.com>
-#
+# Created by: J.R. Oldroyd <fbsd@opal.com>
 # $FreeBSD$
-#
 
 PORTNAME=	tstools
 DISTVERSION=	1_11
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITES=	SF/${PORTNAME}.berlios
 MASTER_SITE_SUBDIR=	tstools
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fbsd@opal.com
 COMMENT=	MPEG transport, program, and elementary stream tools
 
-USE_GMAKE=	yes
+LICENSE=	MPL
+
+USES=		gmake
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 do-install:
-		@${MKDIR} ${PREFIX}/bin
-		${CP} ${WRKSRC}/bin/* ${PREFIX}/bin
-		@${MKDIR} ${PREFIX}/lib
-		${CP} ${WRKSRC}/lib/* ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
-		@${MKDIR} ${PREFIX}/share/docs/${PORTNAME}
-		${CP} ${WRKSRC}/docs/* ${PREFIX}/share/docs/${PORTNAME}
+	${CP} ${WRKSRC}/bin/* ${PREFIX}/bin
+	${CP} ${WRKSRC}/lib/* ${PREFIX}/lib
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/tstools/pkg-plist
==============================================================================
--- head/multimedia/tstools/pkg-plist	Sun Jul 28 12:18:05 2013	(r323822)
+++ head/multimedia/tstools/pkg-plist	Sun Jul 28 12:26:14 2013	(r323823)
@@ -17,15 +17,3 @@ bin/tsplay
 bin/tsreport
 bin/tsserve
 lib/libtstools.a
-%%PORTDOCS%%share/docs/tstools/ac3.txt
-%%PORTDOCS%%share/docs/tstools/adts.txt
-%%PORTDOCS%%share/docs/tstools/build_html.py
-%%PORTDOCS%%share/docs/tstools/default.css
-%%PORTDOCS%%share/docs/tstools/get_next_access_unit.py
-%%PORTDOCS%%share/docs/tstools/get_next_access_unit.py.html
-%%PORTDOCS%%share/docs/tstools/index.txt
-%%PORTDOCS%%share/docs/tstools/library.txt
-%%PORTDOCS%%share/docs/tstools/todo.txt
-%%PORTDOCS%%share/docs/tstools/tools.txt
-%%PORTDOCS%%@dirrm share/docs/tstools
-%%PORTDOCS%%@dirrm share/docs