Date: Fri, 28 Dec 2012 18:14:28 GMT From: Veniamin Gvozdikov <g.veniamin@googlemail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174782: [update]: textpoc/clucene and textproc/clucene-contrib with support NG options style and added conflicts Message-ID: <201212281814.qBSIESbZ053933@red.freebsd.org> Resent-Message-ID: <201212281820.qBSIK08M040919@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174782
>Category: ports
>Synopsis: [update]: textpoc/clucene and textproc/clucene-contrib with support NG options style and added conflicts
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 28 18:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Veniamin Gvozdikov
>Release: FreeBSD 8.3-RELEASE-p5
>Organization:
>Environment:
FreeBSD ololo 8.3-RELEASE-p5 FreeBSD 8.3-RELEASE-p5 #0: Thu Dec 6 16:25:28 MSK 2012 root@ololo:/usr/obj/usr/src/sys/OLOLO amd64
>Description:
Is changes needs by ports/174779 and ports/174779 which's contained NG options style and conflicts with clucene2.
>How-To-Repeat:
>Fix:
diff -ruN clucene.orig/Makefile clucene/Makefile
--- clucene.orig/Makefile 2012-12-28 21:14:45.630601443 +0400
+++ clucene/Makefile 2012-12-28 21:35:40.737736009 +0400
@@ -1,9 +1,5 @@
-# New ports collection makefile for: clucene
-# Date created: 2006-08-09
-# Whom: Cheng-Lung Sung <clsung@FreeBSD.org>
-#
+# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
# $FreeBSD: ports/textproc/clucene/Makefile,v 1.13 2012/11/17 06:01:53 svnexp Exp $
-#
PORTNAME= clucene
PORTVERSION= 0.9.21
@@ -14,15 +10,22 @@
MAINTAINER= clsung@FreeBSD.org
COMMENT= CLucene is a C++ port of Lucene
+LICENSE= AL2
+
+CONFLICTS= clucene2-[0-9]*
+
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= ASCII_SUPPORT
+ASCII_SUPPORT_DESC= Enable ascii support
+
+.include <bsd.port.options.mk>
-.if defined(WITH_ASCII_SUPPORT)
+.if ${PORT_OPTIONS:MASCII_SUPPORT}
CONFIGURE_ARGS+= --enable-ascii
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN clucene-contrib.orig/Makefile clucene-contrib/Makefile
--- clucene-contrib.orig/Makefile 2012-12-28 21:15:09.507360081 +0400
+++ clucene-contrib/Makefile 2012-12-28 21:38:47.305408157 +0400
@@ -1,9 +1,5 @@
-# New ports collection makefile for: clucene-contrib
-# Date created: 2010-10-4
-# Whom: Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
# $FreeBSD: ports/textproc/clucene-contrib/Makefile,v 1.5 2012/11/17 06:01:53 svnexp Exp $
-#
PORTNAME= clucene-contrib
PORTVERSION= 0.9.16a
@@ -13,19 +9,26 @@
MAINTAINER= tj@FreeBSD.org
COMMENT= CLucene Contrib Code and Tools
-LIB_DEPENDS= clucene.0:${PORTSDIR}/textproc/clucene
+LICENSE= AL2
+
+LIB_DEPENDS= clucene:${PORTSDIR}/textproc/clucene
BUILD_DEPENDS= ${LOCALBASE}/include/iconv.h:${PORTSDIR}/converters/libiconv
+CONFLICTS= clucene2-[0-9]*
+
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_DOS2UNIX= yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= ASCII_SUPPORT
+ASCII_SUPPORT_DESC= Enable ascii support
+
+.include <bsd.port.options.mk>
-.if defined(WITH_ASCII_SUPPORT)
+.if ${PORT_OPTIONS:MASCII_SUPPORT}
CONFIGURE_ARGS+= --enable-ascii
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212281814.qBSIESbZ053933>