From owner-svn-ports-head@FreeBSD.ORG  Sat Oct  6 23:01:47 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 579101065670;
	Sat,  6 Oct 2012 23:01:47 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 281298FC0A;
	Sat,  6 Oct 2012 23:01:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q96N1lpm059866;
	Sat, 6 Oct 2012 23:01:47 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q96N1kTD059862;
	Sat, 6 Oct 2012 23:01:46 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210062301.q96N1kTD059862@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 6 Oct 2012 23:01:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305423 - in head: deskutils/orage print/xfce4-print
	x11-fm/thunar-vfs
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 06 Oct 2012 23:01:47 -0000

Author: eadler
Date: Sat Oct  6 23:01:46 2012
New Revision: 305423
URL: http://svn.freebsd.org/changeset/ports/305423

Log:
  Correct logic from OptionsNG conversion.
  
  Pointhat to:	me

Modified:
  head/deskutils/orage/Makefile
  head/print/xfce4-print/Makefile
  head/x11-fm/thunar-vfs/Makefile

Modified: head/deskutils/orage/Makefile
==============================================================================
--- head/deskutils/orage/Makefile	Sat Oct  6 22:54:38 2012	(r305422)
+++ head/deskutils/orage/Makefile	Sat Oct  6 23:01:46 2012	(r305423)
@@ -75,7 +75,7 @@ post-patch:
 		s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g ; \
 		s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g' ${WRKSRC}/configure
 .endif
-.if ${PORT_OPTIONS:MICAL}
+.if empty(PORT_OPTIONS:MICAL)
 	@${REINPLACE_CMD} -e 's|libical-|no-&|g' ${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure

Modified: head/print/xfce4-print/Makefile
==============================================================================
--- head/print/xfce4-print/Makefile	Sat Oct  6 22:54:38 2012	(r305422)
+++ head/print/xfce4-print/Makefile	Sat Oct  6 23:01:46 2012	(r305423)
@@ -40,14 +40,13 @@ PLIST_SUB+=	CUPS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLPR}
-CONFIGURE_ARGS+=--disable-bsdlpr
-PLIST_SUB+=	LPR="@comment "
-.else
 CONFIGURE_ARGS+=--enable-bsdlpr --with-printcap=/etc/printcap
 PLIST_SUB+=	LPR=""
+.else
+CONFIGURE_ARGS+=--disable-bsdlpr
+PLIST_SUB+=	LPR="@comment "
 .endif
 
-
 .if ${PORT_OPTIONS:MLETTER}
 CONFIGURE_ARGS+=--enable-letter
 BUILD_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter

Modified: head/x11-fm/thunar-vfs/Makefile
==============================================================================
--- head/x11-fm/thunar-vfs/Makefile	Sat Oct  6 22:54:38 2012	(r305422)
+++ head/x11-fm/thunar-vfs/Makefile	Sat Oct  6 23:01:46 2012	(r305423)
@@ -75,11 +75,11 @@ CONFIGURE_ARGS+=--disable-gnome-thumbnai
 .endif
 
 .if ${PORT_OPTIONS:MAPIDOCS}
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
+.else
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
 post-patch: