From owner-svn-ports-head@FreeBSD.ORG  Wed Mar 25 17:57:04 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3C8AF165;
 Wed, 25 Mar 2015 17:57:04 +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 273D5B4F;
 Wed, 25 Mar 2015 17:57:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2PHv4R8009602;
 Wed, 25 Mar 2015 17:57:04 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2PHv4kf009601;
 Wed, 25 Mar 2015 17:57:04 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201503251757.t2PHv4kf009601@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Wed, 25 Mar 2015 17:57:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382255 - head/databases/virtuoso
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Mar 2015 17:57:04 -0000

Author: marino
Date: Wed Mar 25 17:57:03 2015
New Revision: 382255
URL: https://svnweb.freebsd.org/changeset/ports/382255
QAT: https://qat.redports.org/buildarchive/r382255/

Log:
  databases/virtusos: take III
  
  It turns out the problematic directory is used, but only if the
  ImageMagick option is set.  Adjust accordingly, and hopefully this is
  the final attempt to fix.

Modified:
  head/databases/virtuoso/Makefile

Modified: head/databases/virtuoso/Makefile
==============================================================================
--- head/databases/virtuoso/Makefile	Wed Mar 25 17:36:47 2015	(r382254)
+++ head/databases/virtuoso/Makefile	Wed Mar 25 17:57:03 2015	(r382255)
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtuoso
 PORTVERSION=	7.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
@@ -59,11 +59,6 @@ post-patch:
 		-e 's,expr \$$,expr -- $$,'\
 		-e 's,netstat -an.*grep.*$$\([a-zA-Z0-9]*\).*grep LISTEN,${CHECK_PORT},'
 
-post-install:
-	${FIND} ${STAGEDIR} -name "*.ini" -exec ${MV} {} {}.sample \; -print
-	${RMDIR} ${STAGEDIR}${PREFIX}/virtuoso/doc/html
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/virtuoso/hosting
-
 check:
 	${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check
 
@@ -102,4 +97,11 @@ USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--disable-openldap
 .endif
 
+post-install:
+	${FIND} ${STAGEDIR} -name "*.ini" -exec ${MV} {} {}.sample \; -print
+	${RMDIR} ${STAGEDIR}${PREFIX}/virtuoso/doc/html
+.if ! ${PORT_OPTIONS:MIMAGEMAGICK}
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/virtuoso/hosting
+.endif
+
 .include <bsd.port.mk>