From owner-svn-ports-head@FreeBSD.ORG  Mon Apr  7 19:16:46 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8F2824CE;
 Mon,  7 Apr 2014 19:16:46 +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 7C7B98C7;
 Mon,  7 Apr 2014 19:16:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37JGkfg002335;
 Mon, 7 Apr 2014 19:16:46 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37JGko2002334;
 Mon, 7 Apr 2014 19:16:46 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404071916.s37JGko2002334@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 7 Apr 2014 19:16:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350535 - head/editors/conglomerate
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.17
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: Mon, 07 Apr 2014 19:16:46 -0000

Author: pawel
Date: Mon Apr  7 19:16:46 2014
New Revision: 350535
URL: http://svnweb.freebsd.org/changeset/ports/350535
QAT: https://qat.redports.org/buildarchive/r350535/

Log:
  - Port is stage safe
  - Convert to USES=pathfix, new options framework
  - Needs USES=desktop-file-utils, bump PORTREVISION

Modified:
  head/editors/conglomerate/Makefile

Modified: head/editors/conglomerate/Makefile
==============================================================================
--- head/editors/conglomerate/Makefile	Mon Apr  7 19:04:03 2014	(r350534)
+++ head/editors/conglomerate/Makefile	Mon Apr  7 19:16:46 2014	(r350535)
@@ -3,7 +3,7 @@
 
 PORTNAME=	conglomerate
 PORTVERSION=	0.9.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Conglomerate%20XML%20Editor/${PORTVERSION}
 
@@ -11,17 +11,14 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME2 visual XML editor with emphasis on DocBook editing
 
 INSTALLS_OMF=	yes
-USES=		gmake pkgconfig
-USE_GNOME=	libgnomeui gtksourceview gnomeprefix gnomehack intlhack
+USES=		desktop-file-utils gmake pathfix pkgconfig
+USE_GNOME=	libgnomeui gtksourceview gnomeprefix intlhack
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	ENCHANT
 
-.if exists(${LOCALBASE}/libdata/pkgconfig/enchant.pc) || defined(WITH_ENCHANT)
-LIB_DEPENDS+=	enchant.1:${PORTSDIR}/textproc/enchant
-.endif
+ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>