Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 May 2013 21:15:44 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317259 - head/net-p2p/mktorrent
Message-ID:  <201305032115.r43LFiEZ041360@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri May  3 21:15:43 2013
New Revision: 317259
URL: http://svnweb.freebsd.org/changeset/ports/317259

Log:
  Fix build with bmake
  While here convert to new options framework

Modified:
  head/net-p2p/mktorrent/Makefile

Modified: head/net-p2p/mktorrent/Makefile
==============================================================================
--- head/net-p2p/mktorrent/Makefile	Fri May  3 21:09:22 2013	(r317258)
+++ head/net-p2p/mktorrent/Makefile	Fri May  3 21:15:43 2013	(r317259)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mktorrent
-# Date created:		9 May 2010
-# Whom:			Damian Gerow <dgerow@afflictions.org>
-#
+# Created by: Damian Gerow <dgerow@afflictions.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mktorrent
 PORTVERSION=	1.0
@@ -11,29 +7,35 @@ CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
 MAINTAINER=	dgerow@afflictions.org
-COMMENT=	A command-line utility for creating BitTorrent metainfo files
+COMMENT=	Command-line utility for creating BitTorrent metainfo files
 
+.if defined(.PARSEDIR)
+USE_GMAKE=	yes
+.else
 MAKEFILE=	BSDmakefile
+.endif
 MAKE_FLAGS=	USE_LONG_OPTIONS=1
 
 PLIST_FILES=	bin/mktorrent
 
-OPTIONS=	THREADS		"Enable support for pthreads"		on \
-		OPENSSL		"Use OpenSSL for hashing"		on \
-		HASHCHECK	"Verify file hashes" 			on
+OPTIONS_DEFINE=	THREADS OPENSSL HASHCHECK
+OPTIONS_DEFAULT=	THREADS OPENSSL HASHCHECK
+THREADS_DESC=	Enable support for pthreads
+OPENSSL_DESC=	Use OpenSSL for hashing
+HASHCHECK_DESC=	Verify file hashes
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 MAKE_FLAGS+=	USE_PTHREADS=1
 .endif
 
-.if !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL}
 MAKE_FLAGS+=	USE_OPENSSL=1
 USE_OPENSSL=	yes
 .endif
 
-.if defined(WITHOUT_HASHCHECK)
+.if ! ${PORT_OPTIONS:MHASHCHECK}
 MAKE_FLAGS+=	NO_HASH_CHECK=1
 .endif
 



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