From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 23 19:09:18 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6E876919;
 Wed, 23 Oct 2013 19:09:18 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 41DF726CF;
 Wed, 23 Oct 2013 19:09:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NJ9IUa005744;
 Wed, 23 Oct 2013 19:09:18 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NJ9HMe005742;
 Wed, 23 Oct 2013 19:09:17 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201310231909.r9NJ9HMe005742@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Wed, 23 Oct 2013 19:09:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331413 - head/www/xapian-omega
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 19:09:18 -0000

Author: sunpoet
Date: Wed Oct 23 19:09:17 2013
New Revision: 331413
URL: http://svnweb.freebsd.org/changeset/ports/331413

Log:
  - Convert to new LIB_DEPENDS format
  - Convert to new options helper
  - Use USES=shebangfix
  - Support STAGEDIR

Modified:
  head/www/xapian-omega/Makefile
  head/www/xapian-omega/pkg-plist   (contents, props changed)

Modified: head/www/xapian-omega/Makefile
==============================================================================
--- head/www/xapian-omega/Makefile	Wed Oct 23 19:06:32 2013	(r331412)
+++ head/www/xapian-omega/Makefile	Wed Oct 23 19:09:17 2013	(r331413)
@@ -12,8 +12,8 @@ COMMENT=	CGI search application built on
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
-		xapian:${PORTSDIR}/databases/xapian-core
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libxapian.so:${PORTSDIR}/databases/xapian-core
 
 OPTIONS_DEFINE=	DOCS EXAMPLES ICONV
 OPTIONS_DEFAULT=ICONV
@@ -27,25 +27,21 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 
-MAN1=		omindex.1 scriptindex.1
 MORE_PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 PORTDOCS=	cgiparams.html index.html omegascript.html overview.html \
 		quickstart.html scriptindex.html termprefixes.html \
 		${MORE_PORTDOCS}
 PORTEXAMPLES=	omega.conf
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+SHEBANG_FILES=	dbi2omega htdig2omega mbox2omega
 
-.if ${PORT_OPTIONS:MICONV}
-USES+=		iconv
-LDFLAGS+=	${ICONV_LIB}
-CONFIGURE_ARGS+=--with-iconv
-.else
-CONFIGURE_ARGS+=--without-iconv
-.endif
+ICONV_CONFIGURE_WITH=	iconv
+ICONV_LDFLAGS=		${ICONV_LIB}
+ICONV_USES=		iconv
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -58,12 +54,12 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/www/xapian-omega/pkg-plist
==============================================================================
--- head/www/xapian-omega/pkg-plist	Wed Oct 23 19:06:32 2013	(r331412)
+++ head/www/xapian-omega/pkg-plist	Wed Oct 23 19:09:17 2013	(r331413)
@@ -3,6 +3,8 @@ bin/htdig2omega
 bin/mbox2omega
 bin/omindex
 bin/scriptindex
+man/man1/omindex.1.gz
+man/man1/scriptindex.1.gz
 share/omega/htdig2omega.script
 share/omega/mbox2omega.script
 %%WWWDIR%%/cgi-bin/omega