From owner-svn-ports-all@FreeBSD.ORG Mon Jul 30 12:10:39 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C26DA1065672; Mon, 30 Jul 2012 12:10:39 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 95E2C8FC20; Mon, 30 Jul 2012 12:10:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6UCAdJa091095; Mon, 30 Jul 2012 12:10:39 GMT (envelope-from zi@svn.freebsd.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6UCAdbg091093; Mon, 30 Jul 2012 12:10:39 GMT (envelope-from zi@svn.freebsd.org) Message-Id: <201207301210.q6UCAdbg091093@svn.freebsd.org> From: Ryan Steinmetz Date: Mon, 30 Jul 2012 12:10:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301715 - head/net/freeradius2 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2012 12:10:39 -0000 Author: zi Date: Mon Jul 30 12:10:39 2012 New Revision: 301715 URL: http://svn.freebsd.org/changeset/ports/301715 Log: - Fix grant statement when using PgSQL [1] - Pacify portlint PR: ports/170253 [1] Submitted by: ohauer [1] Modified: head/net/freeradius2/Makefile Modified: head/net/freeradius2/Makefile ============================================================================== --- head/net/freeradius2/Makefile Mon Jul 30 12:03:36 2012 (r301714) +++ head/net/freeradius2/Makefile Mon Jul 30 12:10:39 2012 (r301715) @@ -25,7 +25,7 @@ COMMENT= A free RADIUS server implementa LICENSE= GPLv2 -LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm +LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm LOGDIR?= /var/log KRB5_CONFIG?= /usr/bin/krb5-config --libs @@ -89,11 +89,11 @@ WITH_KERBEROS= yes .ifdef(WITH_KERBEROS) .ifdef(WITH_HEIMDAL) .ifdef(WITH_HEIMDAL_PORT) -LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal .endif CONFIGURE_ARGS+=--enable-heimdal-krb5 .else -LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 +LIB_DEPENDS+= krb5:${PORTSDIR}/security/krb5 .endif CONFIGURE_ARGS+=--with-rlm_krb5 .if defined (WITH_HEIMDAL) && !defined(WITH_HEIMDAL_PORT) @@ -148,7 +148,7 @@ PLIST_SUB+= PGSQL="@comment " .ifdef(WITH_UNIXODBC) CONFIGURE_ARGS+=--with-rlm_sql_unixodbc PLIST_SUB+= UNIXODBC="" -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+=--without-rlm_sql_unixodbc PLIST_SUB+= UNIXODBC="@comment " @@ -215,7 +215,7 @@ EXPM= yes # No SMB option yet; rlm_smb is still unbuildable .ifdef(WITH_SMB) -LIB_DEPENDS= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient CONFIGURE_ARGS+=--with-rlm_smb CONFIGURE_ARGS+=--with-rlm-smb-lib-dir=${LOCALBASE}/lib CONFIGURE_ARGS+=--with-rlm-smb-include-dir=${LOCALBASE}/include @@ -363,6 +363,9 @@ post-patch: -regex '.*/dictionary\.(orig|bak)$$' \ -delete .endif +# Fix PgSQL statement + @${REINPLACE_CMD} -i '' -e 's|ius.rad||' \ + ${WRKSRC}/raddb/sql/postgresql/admin.sql # Patch scripts/Makefile not to install (unnecessary) rc.radiusd @${REINPLACE_CMD} -Ee 's:^(.+rc\.radiusd.+)$$:#\1:g' \ ${WRKSRC}/scripts/Makefile