Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Apr 2014 21:41:42 +0000 (UTC)
From:      Joe Marcus Clarke <marcus@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351651 - head/net/netatalk
Message-ID:  <201404202141.s3KLfgKu057060@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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