From owner-svn-ports-head@FreeBSD.ORG Sun Nov 2 18:28:36 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AD8FAC1; Sun, 2 Nov 2014 18:28:36 +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 D169624F; Sun, 2 Nov 2014 18:28:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2ISZjO057577; Sun, 2 Nov 2014 18:28:35 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA2ISZHT057574; Sun, 2 Nov 2014 18:28:35 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201411021828.sA2ISZHT057574@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 2 Nov 2014 18:28:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372083 - head/www/sams2 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.18-1 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: Sun, 02 Nov 2014 18:28:36 -0000 Author: marino Date: Sun Nov 2 18:28:34 2014 New Revision: 372083 URL: https://svnweb.freebsd.org/changeset/ports/372083 QAT: https://qat.redports.org/buildarchive/r372083/ Log: www/sams2: fix compatibility with percona and mariadb PR: 194380 Submitted by: Ralf van der Enden Approved by: maintainer Modified: head/www/sams2/Makefile head/www/sams2/pkg-plist Modified: head/www/sams2/Makefile ============================================================================== --- head/www/sams2/Makefile Sun Nov 2 18:20:46 2014 (r372082) +++ head/www/sams2/Makefile Sun Nov 2 18:28:34 2014 (r372083) @@ -2,7 +2,7 @@ PORTNAME= sams2 DISTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://sams.perm.ru/download/ http://razumit.ru/ @@ -12,7 +12,7 @@ COMMENT= Squid Accounting Management Sys LICENSE= BSD4CLAUSE LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -RUN_DEPENDS= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +RUN_DEPENDS= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER} USES= gmake libtool tar:bzip2 USE_AUTOTOOLS= aclocal libtoolize @@ -21,7 +21,7 @@ USE_PHP= gd mysql zlib USE_MYSQL= yes GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +INSTALL_TARGET= install-strip CONFIGURE_ARGS+=--datarootdir=${WWWDIR:H} MAKE_ARGS+= docdir=${DOCSDIR} Modified: head/www/sams2/pkg-plist ============================================================================== --- head/www/sams2/pkg-plist Sun Nov 2 18:20:46 2014 (r372082) +++ head/www/sams2/pkg-plist Sun Nov 2 18:28:34 2014 (r372083) @@ -9,9 +9,11 @@ etc/rc.d/sams2 lib/sams2/libfsusage.a lib/sams2/libfsusage.so lib/sams2/libfsusage.so.1 +lib/sams2/libfsusage.so.1.0.0 lib/sams2/libloadavg.a lib/sams2/libloadavg.so lib/sams2/libloadavg.so.1 +lib/sams2/libloadavg.so.1.0.0 %%WWWDIR%%/authclass.php %%WWWDIR%%/bin/diskspace %%WWWDIR%%/bin/freemem @@ -439,23 +441,3 @@ lib/sams2/libloadavg.so.1 %%WWWDIR%%/trangeclass.php %%WWWDIR%%/tray.php %%WWWDIR%%/userclass.php -@dirrm lib/sams2 -@dirrm %%WWWDIR%%/backup -@dirrm %%WWWDIR%%/bin -@dirrm %%WWWDIR%%/data -@dirrm %%WWWDIR%%/icon/classic -@dirrm %%WWWDIR%%/icon -@dirrm %%WWWDIR%%/lang -@dirrm %%WWWDIR%%/lib -@dirrm %%WWWDIR%%/menu -@dirrm %%WWWDIR%%/plugins/configtray/buttons -@dirrm %%WWWDIR%%/plugins/configtray -@dirrm %%WWWDIR%%/plugins/squid/buttons -@dirrm %%WWWDIR%%/plugins/squid/lang -@dirrm %%WWWDIR%%/plugins/squid -@dirrm %%WWWDIR%%/plugins/webconfig/buttons -@dirrm %%WWWDIR%%/plugins/webconfig/lang -@dirrm %%WWWDIR%%/plugins/webconfig -@dirrm %%WWWDIR%%/plugins -@dirrm %%WWWDIR%%/src -@dirrm %%WWWDIR%%