From owner-svn-ports-head@FreeBSD.ORG Thu Sep 5 10:26:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4281A34C; Thu, 5 Sep 2013 10:26:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 14C32222A; Thu, 5 Sep 2013 10:26:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r85AQfNK021533; Thu, 5 Sep 2013 10:26:41 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r85AQf66021531; Thu, 5 Sep 2013 10:26:41 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201309051026.r85AQf66021531@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 5 Sep 2013 10:26:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326379 - in head/net: netatalk netatalk3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2013 10:26:42 -0000 Author: bapt Date: Thu Sep 5 10:26:41 2013 New Revision: 326379 URL: http://svnweb.freebsd.org/changeset/ports/326379 Log: Fix build on head with iconv in libc Modified: head/net/netatalk/Makefile head/net/netatalk3/Makefile Modified: head/net/netatalk/Makefile ============================================================================== --- head/net/netatalk/Makefile Thu Sep 5 10:07:17 2013 (r326378) +++ head/net/netatalk/Makefile Thu Sep 5 10:26:41 2013 (r326379) @@ -21,7 +21,6 @@ USE_RC_SUBR= netatalk CONFIGURE_ARGS+= --with-tcp-wrappers \ --with-pkgconfdir=${PREFIX}/etc \ - --with-libiconv=${LOCALBASE} \ --with-libgcrypt-dir=${LOCALBASE} \ --with-uams-path=${PREFIX}/libexec/netatalk-uams \ --with-bdb=${LOCALBASE} @@ -120,6 +119,12 @@ CONFIGURE_ARGS+= --enable-sendfile CONFIGURE_ARGS+= --disable-sendfile .endif +.include + +.if !empty(ICONV_LIB) +CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \ @@ -141,4 +146,4 @@ post-install: .endfor @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/net/netatalk3/Makefile ============================================================================== --- head/net/netatalk3/Makefile Thu Sep 5 10:07:17 2013 (r326378) +++ head/net/netatalk3/Makefile Thu Sep 5 10:26:41 2013 (r326379) @@ -24,7 +24,6 @@ USE_RC_SUBR= netatalk CONFIGURE_ARGS+= --enable-tcp-wrappers \ --with-pkgconfdir=${PREFIX}/etc \ - --with-libiconv=${LOCALBASE} \ --with-libgcrypt-dir=${LOCALBASE} \ --with-uams-path=${PREFIX}/libexec/netatalk-uams \ --with-bdb=${LOCALBASE} \ @@ -51,8 +50,6 @@ MAN8= afpd.8 cnid_dbd.8 cnid_metad.8 ne CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]* -.include - .if ${PORT_OPTIONS:MKRB5} CONFIGURE_ARGS+= --enable-krbV-uam PLIST_SUB+= NETATALKKRB5="" @@ -119,6 +116,12 @@ PLIST_SUB+= ATFUNCS="@comment " PLIST_SUB+= ATFUNCS="" .endif +.include + +.if !empty(ICONV_LIB) +CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \