Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Dec 2013 19:47:22 +0000 (UTC)
From:      Chris Rees <crees@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337160 - head/www/mnogosearch
Message-ID:  <201312211947.rBLJlM8R080613@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: crees
Date: Sat Dec 21 19:47:22 2013
New Revision: 337160
URL: http://svnweb.freebsd.org/changeset/ports/337160

Log:
  Update to 3.4.0 and stagify

Deleted:
  head/www/mnogosearch/pkg-deinstall
Modified:
  head/www/mnogosearch/Makefile
  head/www/mnogosearch/distinfo
  head/www/mnogosearch/pkg-plist

Modified: head/www/mnogosearch/Makefile
==============================================================================
--- head/www/mnogosearch/Makefile	Sat Dec 21 18:57:08 2013	(r337159)
+++ head/www/mnogosearch/Makefile	Sat Dec 21 19:47:22 2013	(r337160)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mnogosearch
-PORTVERSION=	3.3.12
+PORTVERSION=	3.4.0
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.mnogosearch.org/Download/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
@@ -15,9 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	dpsearch-[0-9]* udmsearch-[0-9]* mguesser-[0-9]*
 
-MAN1=		indexer.1
-MAN5=		indexer.conf.5
-
 OPTIONS_DEFINE=	THREADS SSL ASIAN SYSLOG
 
 OPTIONS_MULTI=	database
@@ -30,9 +27,9 @@ SYSLOG_DESC=	Send logs to syslog
 SQLITE2_DESC=	Use SQLite 2.x
 SQLITE3_DESC=	Use SQLite 3.x
 
+USES=		gmake
 USE_LDCONFIG=	yes
 USE_GNOME=	lthack
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=--enable-shared \
 		--sysconfdir=${ETCDIR} \
@@ -46,7 +43,6 @@ SHLIB_VER=	1
 
 SUB_FILES+=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
@@ -69,7 +65,7 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSS
 CONFIGURE_ARGS+=	--with-extra-charsets=all
 .endif
 
-.if empty(PORT_OPTIONS:MSYSLOG)
+.if ! ${PORT_OPTIONS:MSYSLOG}
 CONFIGURE_ARGS+=	--disable-syslog
 .endif
 
@@ -98,8 +94,8 @@ USE_SQLITE=	3
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
-DOCS=		ChangeLog INSTALL
-PORTDOCS=	*
+PORTDATA=	*
+PORTDOCS=	ChangeLog INSTALL README.html
 PORTEXAMPLES=	README *.conf
 
 post-patch:
@@ -112,23 +108,21 @@ post-patch:
 		${WRKSRC}/Makefile.in
 .endif
 
-pre-su-install:
-	@${MKDIR} ${DATADIR}
+pre-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 
 post-install:
+.for l in charset search
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmnogo$l-${PORTVERSION:R}.so
+.endfor
 	${LN} -sf libmnogosearch.so \
-		${PREFIX}/lib/libmnogosearch-${PORTVERSION:R}.so.${SHLIB_VER}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} /var/mnogosearch
-.if !defined (NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.    for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.    endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/samples/* ${EXAMPLESDIR}/
-.endif
+		${STAGEDIR}${PREFIX}/lib/libmnogosearch-${PORTVERSION:R}.so.${SHLIB_VER}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS:NREADME.html}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/samples/* ${STAGEDIR}${EXAMPLESDIR}/
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/www/mnogosearch/distinfo
==============================================================================
--- head/www/mnogosearch/distinfo	Sat Dec 21 18:57:08 2013	(r337159)
+++ head/www/mnogosearch/distinfo	Sat Dec 21 19:47:22 2013	(r337160)
@@ -1,2 +1,2 @@
-SHA256 (mnogosearch-3.3.12.tar.gz) = c7f878d2637e7cf13b6ed8b8670c9e126be35c364cc99cf36f80b6eee2a67ae4
-SIZE (mnogosearch-3.3.12.tar.gz) = 4032922
+SHA256 (mnogosearch-3.4.0.tar.gz) = 615946b2b22ddda03f9c9793a062ea5ed9f1255a36f46b1cdc41debea66df64f
+SIZE (mnogosearch-3.4.0.tar.gz) = 4241797

Modified: head/www/mnogosearch/pkg-plist
==============================================================================
--- head/www/mnogosearch/pkg-plist	Sat Dec 21 18:57:08 2013	(r337159)
+++ head/www/mnogosearch/pkg-plist	Sat Dec 21 19:47:22 2013	(r337160)
@@ -1,147 +1,13 @@
+bin/indexer
 bin/mconv
 bin/mguesser
 bin/search.cgi
 bin/udm-config
-%%ETCDIR%%/TraditionalChinese.freq
 %%ETCDIR%%/indexer.conf-dist
 %%ETCDIR%%/langmap.conf-dist
-%%ETCDIR%%/langmap/af.latin1.bible.lm
-%%ETCDIR%%/langmap/af.latin1.lm
-%%ETCDIR%%/langmap/ar.arabic.lm
-%%ETCDIR%%/langmap/ar.arabic.quran.lm
-%%ETCDIR%%/langmap/ar.cp1256.lm
-%%ETCDIR%%/langmap/ar.cp1256.quran.lm
-%%ETCDIR%%/langmap/az.utf8.lm
-%%ETCDIR%%/langmap/be.cp1251.lm
-%%ETCDIR%%/langmap/bg.cp1251.bible.lm
-%%ETCDIR%%/langmap/bg.cp1251.lm
-%%ETCDIR%%/langmap/bg.cyrillic.bible.lm
-%%ETCDIR%%/langmap/bg.cyrillic.lm
-%%ETCDIR%%/langmap/br.latin1.lm
-%%ETCDIR%%/langmap/bs.ascii.lm
-%%ETCDIR%%/langmap/bs.cp1250.lm
-%%ETCDIR%%/langmap/bs.latin2.lm
-%%ETCDIR%%/langmap/ca.latin1.lit.lm
-%%ETCDIR%%/langmap/ca.latin1.lm
-%%ETCDIR%%/langmap/cs.cp1250.lm
-%%ETCDIR%%/langmap/cs.latin2.lm
-%%ETCDIR%%/langmap/cy.latin1.lm
-%%ETCDIR%%/langmap/da.latin1.bible.lm
-%%ETCDIR%%/langmap/da.latin1.lm
-%%ETCDIR%%/langmap/de.latin1.bible.lm
-%%ETCDIR%%/langmap/de.latin1.lm
-%%ETCDIR%%/langmap/el.cp1253.lm
-%%ETCDIR%%/langmap/el.greek.lm
-%%ETCDIR%%/langmap/en.ascii.lm
-%%ETCDIR%%/langmap/eo.latin1-h.as.lm
-%%ETCDIR%%/langmap/eo.latin1-x.as.lm
-%%ETCDIR%%/langmap/eo.latin3.as.lm
-%%ETCDIR%%/langmap/eo.latin3.lm
-%%ETCDIR%%/langmap/eo.utf8.as.lm
-%%ETCDIR%%/langmap/es.latin1.bible.lm
-%%ETCDIR%%/langmap/es.latin1.lm
-%%ETCDIR%%/langmap/et.cp1257.lm
-%%ETCDIR%%/langmap/et.latin4.lm
-%%ETCDIR%%/langmap/eu.latin1.lm
-%%ETCDIR%%/langmap/fi.latin1.lm
-%%ETCDIR%%/langmap/fr.latin1.bible.lm
-%%ETCDIR%%/langmap/fr.latin1.lm
-%%ETCDIR%%/langmap/ga.latin1.lit.lm
-%%ETCDIR%%/langmap/ga.latin1.lm
-%%ETCDIR%%/langmap/hi.utf8.lm
-%%ETCDIR%%/langmap/he.hebrew.lm
-%%ETCDIR%%/langmap/hr.ascii.lm
-%%ETCDIR%%/langmap/hr.cp1250.bible.lm
-%%ETCDIR%%/langmap/hr.cp1250.lm
-%%ETCDIR%%/langmap/hr.latin2.lm
-%%ETCDIR%%/langmap/hu.cp1250.lm
-%%ETCDIR%%/langmap/hu.latin2.lm
-%%ETCDIR%%/langmap/hy.armscii-8.lm
-%%ETCDIR%%/langmap/is.latin1.lm
-%%ETCDIR%%/langmap/it.latin1.lm
-%%ETCDIR%%/langmap/ja.euc-jp.lm
-%%ETCDIR%%/langmap/ja.sjis.lm
-%%ETCDIR%%/langmap/ka.utf8.lm
-%%ETCDIR%%/langmap/la.ascii.lm
-%%ETCDIR%%/langmap/lt.cp1257.lm
-%%ETCDIR%%/langmap/lt.latin4.lm
-%%ETCDIR%%/langmap/lv.cp1257.lm
-%%ETCDIR%%/langmap/lv.latin4.lm
-%%ETCDIR%%/langmap/nl.latin1.bible.lm
-%%ETCDIR%%/langmap/nl.latin1.lm
-%%ETCDIR%%/langmap/no.latin1.lm
-%%ETCDIR%%/langmap/pl.latin2.lm
-%%ETCDIR%%/langmap/pt-br.latin1.lm
-%%ETCDIR%%/langmap/pt-pt.latin1.lm
-%%ETCDIR%%/langmap/ro.ascii.lm
-%%ETCDIR%%/langmap/ro.cp1250.lm
-%%ETCDIR%%/langmap/ro.latin2.lm
-%%ETCDIR%%/langmap/ru.cp1251.lm
-%%ETCDIR%%/langmap/ru.cp866.lm
-%%ETCDIR%%/langmap/ru.cyrillic.lm
-%%ETCDIR%%/langmap/ru.koi8-r.lm
-%%ETCDIR%%/langmap/ru.maccyr.lm
-%%ETCDIR%%/langmap/ru.utf8.lm
-%%ETCDIR%%/langmap/sk.ascii.lm
-%%ETCDIR%%/langmap/sk.cp1250.lm
-%%ETCDIR%%/langmap/sk.latin2.lm
-%%ETCDIR%%/langmap/sl.ascii.lm
-%%ETCDIR%%/langmap/sl.cp1250.lm
-%%ETCDIR%%/langmap/sl.latin2.lm
-%%ETCDIR%%/langmap/sq.latin1.lm
-%%ETCDIR%%/langmap/sr.cp1250.lm
-%%ETCDIR%%/langmap/sr.latin2.lm
-%%ETCDIR%%/langmap/sv.latin1.bible.lm
-%%ETCDIR%%/langmap/sv.latin1.lm
-%%ETCDIR%%/langmap/sw.latin1.lm
-%%ETCDIR%%/langmap/ta.tscii.lm
-%%ETCDIR%%/langmap/th.cp874.lm
-%%ETCDIR%%/langmap/th.tis-620.lm
-%%ETCDIR%%/langmap/tl.ascii.bible.lm
-%%ETCDIR%%/langmap/tl.ascii.lm
-%%ETCDIR%%/langmap/tr.cp1254.lm
-%%ETCDIR%%/langmap/tr.cp857.lm
-%%ETCDIR%%/langmap/tr.latin5.lm
-%%ETCDIR%%/langmap/ua.cp1251.lm
-%%ETCDIR%%/langmap/ua.koi8-u.lm
-%%ETCDIR%%/langmap/vi.viscii.lm
-%%ETCDIR%%/langmap/zh.big5.lm
-%%ETCDIR%%/langmap/zh.gb2312.lm
-%%ETCDIR%%/langmap/zh-hans.utf8.lm
-%%ETCDIR%%/langmap/zh-hant.utf8.lm
-%%ETCDIR%%/mandarin.freq
 %%ETCDIR%%/node.xml-dist
 %%ETCDIR%%/search.htm-dist
 %%ETCDIR%%/stopwords.conf-dist
-%%ETCDIR%%/stopwords/ct.sl
-%%ETCDIR%%/stopwords/cz.sl
-%%ETCDIR%%/stopwords/da.sl
-%%ETCDIR%%/stopwords/de.sl
-%%ETCDIR%%/stopwords/en.big.sl
-%%ETCDIR%%/stopwords/en.huge.sl
-%%ETCDIR%%/stopwords/en.sl
-%%ETCDIR%%/stopwords/es.sl
-%%ETCDIR%%/stopwords/fr.sl
-%%ETCDIR%%/stopwords/hu.sl
-%%ETCDIR%%/stopwords/it.sl
-%%ETCDIR%%/stopwords/ja.sl
-%%ETCDIR%%/stopwords/lt.sl
-%%ETCDIR%%/stopwords/nl.sl
-%%ETCDIR%%/stopwords/no.sl
-%%ETCDIR%%/stopwords/pl.sl
-%%ETCDIR%%/stopwords/pt.sl
-%%ETCDIR%%/stopwords/ru.sl
-%%ETCDIR%%/stopwords/se.sl
-%%ETCDIR%%/stopwords/sk.sl
-%%ETCDIR%%/stopwords/tr.sl
-%%ETCDIR%%/stopwords/ua.sl
-%%ETCDIR%%/stopwords/zh.sl
-%%ETCDIR%%/synonym/english.syn
-%%ETCDIR%%/synonym/french.syn
-%%ETCDIR%%/synonym/italian.syn
-%%ETCDIR%%/synonym/russian.syn
-%%ETCDIR%%/synonym/russian.big.syn
-%%ETCDIR%%/thai.freq
 include/udm_agent.h
 include/udm_alias.h
 include/udm_autoconf.h
@@ -152,7 +18,6 @@ include/udm_conf.h
 include/udm_config.h
 include/udm_contentencoding.h
 include/udm_crc32.h
-include/udm_crossword.h
 include/udm_db.h
 include/udm_db_int.h
 include/udm_dirent.h
@@ -167,6 +32,7 @@ include/udm_host.h
 include/udm_hrefs.h
 include/udm_http.h
 include/udm_id3.h
+include/udm_indexcache.h
 include/udm_indexer.h
 include/udm_log.h
 include/udm_match.h
@@ -181,7 +47,6 @@ include/udm_result.h
 include/udm_robots.h
 include/udm_sdp.h
 include/udm_search_tl.h
-include/udm_searchcache.h
 include/udm_searchtool.h
 include/udm_server.h
 include/udm_services.h
@@ -205,100 +70,16 @@ include/udm_wild.h
 include/udm_word.h
 include/udm_xmalloc.h
 include/udmsearch.h
-lib/libmnogocharset-3.3.so
+lib/libmnogocharset-3.4.so
 lib/libmnogocharset.a
 lib/libmnogocharset.la
 lib/libmnogocharset.so
-lib/libmnogosearch-3.3.so.%%SHLIB_VER%%
-lib/libmnogosearch-3.3.so
+lib/libmnogosearch-3.4.so
+lib/libmnogosearch-3.4.so.%%SHLIB_VER%%
 lib/libmnogosearch.a
 lib/libmnogosearch.la
 lib/libmnogosearch.so
-sbin/indexer
-%%DATADIR%%/cache/create.multi.sql
-%%DATADIR%%/cache/create.single.sql
-%%DATADIR%%/cache/drop.multi.sql
-%%DATADIR%%/cache/drop.single.sql
-%%DATADIR%%/db2/create.blob.sql
-%%DATADIR%%/db2/create.multi.sql
-%%DATADIR%%/db2/create.single.sql
-%%DATADIR%%/db2/drop.blob.sql
-%%DATADIR%%/db2/drop.multi.sql
-%%DATADIR%%/db2/drop.single.sql
-%%DATADIR%%/ibase/create.blob.sql
-%%DATADIR%%/ibase/create.multi.sql
-%%DATADIR%%/ibase/create.single.sql
-%%DATADIR%%/ibase/drop.blob.sql
-%%DATADIR%%/ibase/drop.multi.sql
-%%DATADIR%%/ibase/drop.single.sql
-%%DATADIR%%/mimer/create.blob.sql
-%%DATADIR%%/mimer/create.multi.sql
-%%DATADIR%%/mimer/create.single.sql
-%%DATADIR%%/mimer/drop.blob.sql
-%%DATADIR%%/mimer/drop.multi.sql
-%%DATADIR%%/mimer/drop.single.sql
-%%DATADIR%%/monetdb/create.blob.sql
-%%DATADIR%%/monetdb/create.multi.sql
-%%DATADIR%%/monetdb/create.single.sql
-%%DATADIR%%/monetdb/drop.blob.sql
-%%DATADIR%%/monetdb/drop.multi.sql
-%%DATADIR%%/monetdb/drop.single.sql
-%%DATADIR%%/mssql/create.blob.sql
-%%DATADIR%%/mssql/create.multi.sql
-%%DATADIR%%/mssql/create.single.sql
-%%DATADIR%%/mssql/drop.blob.sql
-%%DATADIR%%/mssql/drop.multi.sql
-%%DATADIR%%/mssql/drop.single.sql
-%%DATADIR%%/mysql/create.blob.sql
-%%DATADIR%%/mysql/create.multi.sql
-%%DATADIR%%/mysql/create.single.sql
-%%DATADIR%%/mysql/drop.blob.sql
-%%DATADIR%%/mysql/drop.multi.sql
-%%DATADIR%%/mysql/drop.single.sql
-%%DATADIR%%/oracle/create.blob.sql
-%%DATADIR%%/oracle/create.multi.sql
-%%DATADIR%%/oracle/create.single.sql
-%%DATADIR%%/oracle/drop.blob.sql
-%%DATADIR%%/oracle/drop.multi.sql
-%%DATADIR%%/oracle/drop.single.sql
-%%DATADIR%%/pgsql/create.blob.sql
-%%DATADIR%%/pgsql/create.multi.sql
-%%DATADIR%%/pgsql/create.single.sql
-%%DATADIR%%/pgsql/drop.blob.sql
-%%DATADIR%%/pgsql/drop.multi.sql
-%%DATADIR%%/pgsql/drop.single.sql
-%%DATADIR%%/sqlite/create.blob.sql
-%%DATADIR%%/sqlite/create.multi.sql
-%%DATADIR%%/sqlite/create.single.sql
-%%DATADIR%%/sqlite/drop.blob.sql
-%%DATADIR%%/sqlite/drop.multi.sql
-%%DATADIR%%/sqlite/drop.single.sql
-%%DATADIR%%/sybase/create.blob.sql
-%%DATADIR%%/sybase/create.multi.sql
-%%DATADIR%%/sybase/create.single.sql
-%%DATADIR%%/sybase/drop.blob.sql
-%%DATADIR%%/sybase/drop.multi.sql
-%%DATADIR%%/sybase/drop.single.sql
-%%DATADIR%%/virtuoso/create.blob.sql
-%%DATADIR%%/virtuoso/create.multi.sql
-%%DATADIR%%/virtuoso/create.single.sql
-%%DATADIR%%/virtuoso/drop.blob.sql
-%%DATADIR%%/virtuoso/drop.multi.sql
-%%DATADIR%%/virtuoso/drop.single.sql
-@dirrm %%DATADIR%%/cache
-@dirrm %%DATADIR%%/mimer
-@dirrm %%DATADIR%%/monetdb
-@dirrm %%DATADIR%%/sqlite
-@dirrm %%DATADIR%%/virtuoso
-@dirrm %%DATADIR%%/pgsql
-@dirrm %%DATADIR%%/oracle
-@dirrm %%DATADIR%%/mysql
-@dirrm %%DATADIR%%/ibase
-@dirrm %%DATADIR%%/db2
-@dirrm %%DATADIR%%/mssql
-@dirrm %%DATADIR%%/sybase
-@dirrm %%DATADIR%%
-@dirrm %%ETCDIR%%/synonym
-@dirrm %%ETCDIR%%/stopwords
-@dirrm %%ETCDIR%%/langmap
-@dirrm %%ETCDIR%%
+man/man1/indexer.1.gz
+man/man5/indexer.conf.5.gz
+@unexec rmdir >/dev/null 2>&1 /var/mnogosearch || :
+@dirrmtry %%ETCDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312211947.rBLJlM8R080613>