From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 16 18:13:59 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A48AAD4D;
 Sun, 16 Dec 2012 18:13:59 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6ED288FC12;
 Sun, 16 Dec 2012 18:13:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGIDxDS027006;
 Sun, 16 Dec 2012 18:13:59 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGIDxqo027005;
 Sun, 16 Dec 2012 18:13:59 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212161813.qBGIDxqo027005@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 16 Dec 2012 18:13:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309034 - head/security/stegdetect
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 18:13:59 -0000

Author: bapt
Date: Sun Dec 16 18:13:58 2012
New Revision: 309034
URL: http://svnweb.freebsd.org/changeset/ports/309034

Log:
  Convert to new options framework

Modified:
  head/security/stegdetect/Makefile

Modified: head/security/stegdetect/Makefile
==============================================================================
--- head/security/stegdetect/Makefile	Sun Dec 16 18:11:51 2012	(r309033)
+++ head/security/stegdetect/Makefile	Sun Dec 16 18:13:58 2012	(r309034)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	stegdetect
-# Date created:				Jul 19, 2001
-# Whom:					Mark Pulford <mark@kyne.com.au>
-#
+# Created by: Mark Pulford <mark@kyne.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	stegdetect
 PORTVERSION=	0.6
@@ -16,12 +12,18 @@ MASTER_SITES=	http://www.outguess.org/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automated tool for detecting steganographic content in JPEGs
 
-OPTIONS=	X11 "Build xsteg" On
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=	X11
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
+USE_GNOME=	gtk12
+CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
+PLIST_SUB+=	X11=""
+.else
+PLIST_SUB+=	X11="@comment "
 .endif
 
 # Note: stegdetect includes a modified version of jpeg-6b linked statically
@@ -30,18 +32,10 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS+=--program-prefix=''
 MAN1=		stegdetect.1 stegbreak.1
 
-.if defined(WITHOUT_X11)
-PLIST_SUB+=	X11="@comment "
-.else
-USE_GNOME=	gtk12
-CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
-PLIST_SUB+=	X11=""
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's;/usr/include/event;${LOCALBASE}/include;g' \
 		${WRKSRC}/configure
-.if defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} 's/gtk-config//g' ${WRKSRC}/configure
 .endif