Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Nov 2014 18:28:35 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r372083 - head/www/sams2
Message-ID:  <201411021828.sA2ISZHT057574@svn.freebsd.org>

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



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