Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Apr 2014 20:53:54 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r351713 - branches/2014Q2/databases/sqlbuddy
Message-ID:  <201404212053.s3LKrsGG027475@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Mon Apr 21 20:53:54 2014
New Revision: 351713
URL: http://svnweb.freebsd.org/changeset/ports/351713
QAT: https://qat.redports.org/buildarchive/r351713/

Log:
  MFH: r351703
  
  databases/sqlbuddy: Unbreak and stage
  
  The maintainer actually provided a PR to address the breakage long
  before it was marked broken.  itetcu asked him a valid question: Why
  is sqlbuddy defaulting to sqlite when it is primarily a mysql tool?
  The question was never answered and the PR got thrown back on the heap.
  
  The SQLite component is what is missing.  Let's remove sqlite as an
  option to restore the build and stage while here.  It's bumped because
  of the change in default options.
  
  PR:		ports/181708
  submitted by:	maintainer (Chenguang Li)
  modified by:	marino
  Approved by:	portmgr (antoine)

Modified:
  branches/2014Q2/databases/sqlbuddy/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/databases/sqlbuddy/Makefile
==============================================================================
--- branches/2014Q2/databases/sqlbuddy/Makefile	Mon Apr 21 20:47:50 2014	(r351712)
+++ branches/2014Q2/databases/sqlbuddy/Makefile	Mon Apr 21 20:53:54 2014	(r351713)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sqlbuddy
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	http://www.sqlbuddy.com/download/
 DISTNAME=	${PORTNAME}_1_3_3
@@ -10,35 +11,20 @@ DISTNAME=	${PORTNAME}_1_3_3
 MAINTAINER=	horus.li@gmail.com
 COMMENT=	Web based MySQL administration with a set of PHP scripts
 
-BROKEN=		Fails to check-sanity
-
 USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_PHP=	ctype pcre session
+USE_PHP=	ctype pcre session mysql
 WANT_PHP_WEB=	yes
 
-OPTIONS_DEFINE=	MYSQL SQLITE
-OPTIONS_DEFAULT=	SQLITE
-
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_PHP+=	mysql
-.endif
-.if ${PORT_OPTIONS:MSQLITE}
-USE_PHP+=	sqlite
-.endif
-
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "NOTE:"
-	@${ECHO_MSG} "This port suppose you have already installed one or both of these databases supported, "
+	@${ECHO_MSG} "This port assumes you have already installed a mysql database, "
 	@${ECHO_MSG} "and you want to use SQL Buddy to manage the server."
 	@${ECHO_MSG} "If you are planning to install it/them on this machine later, "
 	@${ECHO_MSG} "you can find it/them at ${PORTSDIR}/databases."
@@ -47,9 +33,8 @@ pre-everything::
 do-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Installing SQL Buddy under ${WWWDIR}/"
-	@${MKDIR} ${WWWDIR}
-	@cd ${WRKSRC} && ${CP} -R * ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	@cd ${WRKSRC} && ${CP} -R * ${STAGEDIR}${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>



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