From owner-svn-ports-all@FreeBSD.ORG  Sun Apr 20 21:41:42 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTPS id 6952566A;
 Sun, 20 Apr 2014 21:41:42 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 56E071795;
 Sun, 20 Apr 2014 21:41:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3KLfgi7057061;
 Sun, 20 Apr 2014 21:41:42 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3KLfgKu057060;
 Sun, 20 Apr 2014 21:41:42 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <201404202141.s3KLfgKu057060@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sun, 20 Apr 2014 21:41:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351651 - head/net/netatalk
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.17
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, 20 Apr 2014 21:41:42 -0000

Author: marcus
Date: Sun Apr 20 21:41:41 2014
New Revision: 351651
URL: http://svnweb.freebsd.org/changeset/ports/351651
QAT: https://qat.redports.org/buildarchive/r351651/

Log:
  Switch to using an exists() check on netatalk/ddp.h.
  
  Suggested by:	danfe

Modified:
  head/net/netatalk/Makefile

Modified: head/net/netatalk/Makefile
==============================================================================
--- head/net/netatalk/Makefile	Sun Apr 20 21:25:18 2014	(r351650)
+++ head/net/netatalk/Makefile	Sun Apr 20 21:41:41 2014	(r351651)
@@ -26,9 +26,7 @@ CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-uams-path=${PREFIX}/libexec/netatalk-uams \
 			--with-bdb=${LOCALBASE}
 
-OPTIONS_DEFINE=	APPLETALK SRVLOC PAM TIMELORD KRB5 ZEROCONF LDAP SENDFILE
-OPTIONS_DEFAULT=APPLETALK
-APPLETALK_DESC=	AppleTalk protocol support (where supported)
+OPTIONS_DEFINE=	SRVLOC PAM TIMELORD KRB5 ZEROCONF LDAP SENDFILE
 SRVLOC_DESC=	Service Location Protocol support
 TIMELORD_DESC=	Timelord network time service
 KRB5_DESC=	Kerberos V UAM
@@ -41,6 +39,12 @@ LINKS=		unbin unhex unsingle hqx2bin sin
 
 CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-1* yudit-[0-9]*
 
+.if exists(/usr/include/netatalk/ddp.h)
+OPTIONS_DEFINE+=APPLETALK
+OPTIONS_DEFAULT=APPLETALK
+APPLETALK_DESC=	AppleTalk protocol support
+.endif
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKRB5}
@@ -50,7 +54,7 @@ PLIST_SUB+=		NETATALKKRB5=""
 PLIST_SUB+=		NETATALKKRB5="@comment "
 .endif
 
-.if ${OSVERSION} < 1100013 && ${PORT_OPTIONS:MAPPLETALK}
+.if ${PORT_OPTIONS:MAPPLETALK}
 CONFIGURE_ARGS+=	--enable-ddp
 PLIST_SUB+=		APPLETALK=""
 FILES+=			atalkd.conf papd.conf