From owner-svn-ports-all@freebsd.org Thu Oct 1 09:42:21 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27C0FA0C86A; Thu, 1 Oct 2015 09:42:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.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 F40A21BB5; Thu, 1 Oct 2015 09:42:20 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t919gKRn007567; Thu, 1 Oct 2015 09:42:20 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t919gKOX007565; Thu, 1 Oct 2015 09:42:20 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510010942.t919gKOX007565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 1 Oct 2015 09:42:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398265 - head/databases/namazu2 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2015 09:42:21 -0000 Author: amdmi3 Date: Thu Oct 1 09:42:19 2015 New Revision: 398265 URL: https://svnweb.freebsd.org/changeset/ports/398265 Log: - Add CPE info - Use /var instead of PREFIX/var - Don't install win32 configs - Use @sample - Properly handle vardirs in plist Modified: head/databases/namazu2/Makefile head/databases/namazu2/pkg-plist Modified: head/databases/namazu2/Makefile ============================================================================== --- head/databases/namazu2/Makefile Thu Oct 1 09:35:26 2015 (r398264) +++ head/databases/namazu2/Makefile Thu Oct 1 09:42:19 2015 (r398265) @@ -3,7 +3,7 @@ PORTNAME= namazu PORTVERSION= ${NAMAZU_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= databases www textproc MASTER_SITES= http://www.namazu.org/stable/ PKGNAMESUFFIX= 2 @@ -14,11 +14,13 @@ COMMENT= Full-text search system intende BUILD_DEPENDS= p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic RUN_DEPENDS= p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic -USES= gettext iconv libtool perl5 +USES= cpe gettext iconv libtool perl5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-perl5="${PERL}" \ --with-libintl-prefix=${LOCALBASE} \ + --localstatedir=/var \ ${ICONV_CONFIGURE_ARG} +INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS @@ -27,8 +29,14 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|/usr/local/var|/var|g' ${WRKSRC}/conf/namazurc-sample post-install: + ${RM} ${STAGEDIR}${PREFIX}/etc/namazu/*win32 + ${MV} ${STAGEDIR}${PREFIX}/etc/namazu/mknmzrc-sample \ + ${STAGEDIR}${PREFIX}/etc/namazu/mknmzrc.sample + ${MV} ${STAGEDIR}${PREFIX}/etc/namazu/namazurc-sample \ + ${STAGEDIR}${PREFIX}/etc/namazu/namazurc.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.css ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/en Modified: head/databases/namazu2/pkg-plist ============================================================================== --- head/databases/namazu2/pkg-plist Thu Oct 1 09:35:26 2015 (r398264) +++ head/databases/namazu2/pkg-plist Thu Oct 1 09:42:19 2015 (r398265) @@ -15,10 +15,8 @@ bin/rfnmz bin/vfnmz man/man1/mknmz.1.gz man/man1/namazu.1.gz -etc/namazu/mknmzrc-sample -etc/namazu/mknmzrc-sample.win32 -etc/namazu/namazurc-sample -etc/namazu/namazurc-sample.win32 +@sample etc/namazu/mknmzrc.sample +@sample etc/namazu/namazurc.sample include/namazu/codeconv.h include/namazu/field.h include/namazu/hlist.h @@ -156,3 +154,5 @@ share/locale/pl/LC_MESSAGES/namazu.mo %%DATADIR%%/template/NMZ.tips.fr %%DATADIR%%/template/NMZ.tips.ja %%DATADIR%%/template/NMZ.tips.pl +@dir /var/namazu/index +@dir /var/namazu