Date: Thu, 5 Sep 2013 10:26:41 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326379 - in head/net: netatalk netatalk3 Message-ID: <201309051026.r85AQf66021531@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk> 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 <bsd.port.pre.mk> - .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 <bsd.port.pre.mk> + +.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 ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309051026.r85AQf66021531>