Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/Makefile,v
retrieving revision 1.96
diff -u -p -u -r1.96 Makefile
--- Makefile	25 Dec 2006 02:59:59 -0000	1.96
+++ Makefile	30 Dec 2006 11:36:29 -0000
@@ -51,9 +51,6 @@ PLIST_SUB=	NLS=""
 USE_OPENLDAP=	YES
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 PLIST_SUB+=	LDAP=""
-.if defined(WITHOUT_LDAP)
-BROKEN=		Conflict options: WITHOUT_LDAP/WITH_LDAP
-.endif
 .else
 CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUB+=	LDAP="@comment "
@@ -63,9 +60,6 @@ PLIST_SUB+=	LDAP="@comment "
 CONFIGURE_ARGS+=--enable-scdaemon
 LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 PLIST_SUB+=	SCDAEMON=""
-.if defined(WITHOUT_SCDAEMON)
-BROKEN=		Conflict options: WITHOUT_SCDAEMON/WITH_SCDAEMON
-.endif
 .else
 CONFIGURE_ARGS+=--disable-scdaemon
 PLIST_SUB+=	SCDAEMON="@comment "
@@ -73,9 +67,6 @@ PLIST_SUB+=	SCDAEMON="@comment "
 
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=--without-libcurl
-.if defined(WITH_CURL)
-BROKEN=		Conflict options: WITHOUT_CURL/WITH_CURL
-.endif
 .else
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}