- Stage report

PR:		190512
Submitted by:	maintainer

6 files changed, 45 insertions, 69 deletions

diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 40b63b865615..d20bb516ecfd 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	udmsearch
 PORTVERSION=	3.1.7
+PORTREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.mnogosearch.org/Download/ \
 		http://udmsearch.real-time.com/Download/
@@ -10,8 +11,7 @@ MASTER_SITES=	http://www.mnogosearch.org/Download/ \
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Full featured SQL-based hypertext search engine
 
-OPTIONS_DEFINE=		MSQL MYSQL PGSQL
-OPTIONS_DEFAULT=	MYSQL
+LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-charset-guesser \
@@ -19,34 +19,29 @@ CONFIGURE_ARGS=	--enable-charset-guesser \
 		--sysconfdir=${PREFIX}/etc/udmsearch \
 		--localstatedir=/var/udmsearch
 
-MAN1=		indexer.1
-MAN5=		indexer.conf.5
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		MSQL MYSQL PGSQL DOCS
+OPTIONS_DEFAULT=	MYSQL
 
-.if ${PORT_OPTIONS:MMSQL}
-BUILD_DEPENDS=		${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql
-CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
-.endif
+MSQL_BUILD_DEPENDS=	${LOCALBASE}/lib/libmsql.a:${PORTSDIR}/databases/msql
+MSQL_CONFIGURE_ON+=	--with-msql=${LOCALBASE}
+MYSQL_USE=	MYSQL=YES
+MYSQL_CONFIGURE_ON+=	--with-mysql=${LOCALBASE}
+PGSQL_USE=	PGSQL=YES
+PGSQL_CONFIGURE_ON+=	--with-pgsql=${LOCALBASE}/pgsql
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-.endif
+PORTDOCS=	*
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		YES
-CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}/pgsql
-.endif
+SUB_FILES=	pkg-message
+.include <bsd.port.options.mk>
 
 pre-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 
 post-install:
-	@${CP} -R ${WRKSRC}/create ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
+	@${CP} -R ${WRKSRC}/create ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
+	${CP} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
+	${CP} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/udmsearch/files/patch-Makefile.in b/www/udmsearch/files/patch-Makefile.in
new file mode 100644
index 000000000000..53da87812057
--- /dev/null
+++ b/www/udmsearch/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2014-05-12 02:45:44.003408363 +0600
++++ Makefile.in	2014-05-12 02:47:54.685398481 +0600
+@@ -350,7 +350,7 @@
+ install-data: install-data-recursive
+ 
+ install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install: install-recursive
+ uninstall-am: uninstall-binSCRIPTS
+ uninstall: uninstall-recursive
diff --git a/www/udmsearch/files/patch-configure.in b/www/udmsearch/files/patch-configure.in
deleted file mode 100644
index 899a23c76f8a..000000000000
--- a/www/udmsearch/files/patch-configure.in
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru ../udmsearch-3.0.19/doc/Makefile.in ./doc/Makefile.in
---- ../udmsearch-3.0.19/doc/Makefile.in	Thu Jun 15 10:27:15 2000
-+++ ./doc/Makefile.in	Sat Jul  8 15:09:00 2000
-@@ -273,9 +273,9 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(prefix)/doc
--	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/doc/
--	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/doc/
-+	$(mkinstalldirs) $(prefix)/share/doc/udmsearch
-+	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/share/doc/udmsearch
-+	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/share/doc/udmsearch
- 
- dist-hook:
- 	cp -rf samples $(distdir)
diff --git a/www/udmsearch/files/patch-doc-Makefile.in b/www/udmsearch/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..6e6b21ce72a8
--- /dev/null
+++ b/www/udmsearch/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	2014-05-12 02:17:06.920526387 +0600
++++ doc/Makefile.in	2014-05-12 02:17:22.799526083 +0600
+@@ -230,7 +230,7 @@
+ install-exec-am:
+ install-exec: install-exec-am
+ 
+-install-data-am: install-man install-data-local
++install-data-am: install-man
+ install-data: install-data-am
+ 
+ install-am: all-am
diff --git a/www/udmsearch/pkg-message b/www/udmsearch/files/pkg-message.in
index 481991891eac..edf254b4dc0e 100644
--- a/www/udmsearch/pkg-message
+++ b/www/udmsearch/files/pkg-message.in
@@ -1,6 +1,6 @@
 Udmsearch is successfully installed.
 Now, to use udmsearch you need to create the appropriate mysql database
-manually: Please read INSTALL file located in ${PREFIX}/share/doc/udmsearch.
+manually: Please read INSTALL file located in %%DOCSDIR%%.
 
 For more information on how to use udmsearch, please refer to their
 web site at http://search.mnoGo.ru/
diff --git a/www/udmsearch/pkg-plist b/www/udmsearch/pkg-plist
index f22dd9de4a08..e7b166677bfa 100644
--- a/www/udmsearch/pkg-plist
+++ b/www/udmsearch/pkg-plist
@@ -49,33 +49,6 @@
 %%DATADIR%%/create/virtuoso/crc.txt
 %%DATADIR%%/create/virtuoso/create.txt
 %%DATADIR%%/create/virtuoso/multi.txt
-%%DOCSDIR%%/HTDB.txt
-%%DOCSDIR%%/HTTP-codes.txt
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS.html
-%%DOCSDIR%%/UdmSearch-Oracle8.html
-%%DOCSDIR%%/bugs.txt
-%%DOCSDIR%%/cache.txt
-%%DOCSDIR%%/cachemode.txt
-%%DOCSDIR%%/categories.txt
-%%DOCSDIR%%/charset.txt
-%%DOCSDIR%%/follow.txt
-%%DOCSDIR%%/hrefonly.txt
-%%DOCSDIR%%/html.txt
-%%DOCSDIR%%/ispell.txt
-%%DOCSDIR%%/lib.txt
-%%DOCSDIR%%/mp3.txt
-%%DOCSDIR%%/negotiation.txt
-%%DOCSDIR%%/parsers.txt
-%%DOCSDIR%%/performance.txt
-%%DOCSDIR%%/search.txt
-%%DOCSDIR%%/srv_table.txt
-%%DOCSDIR%%/storage.txt
-%%DOCSDIR%%/syslog.txt
-%%DOCSDIR%%/tags.txt
-%%DOCSDIR%%/templates.txt
-%%DOCSDIR%%/tracking.txt
-%%DOCSDIR%%/usage.txt
 bin/search.cgi
 bin/udm-config
 etc/udmsearch/indexer.conf-dist
@@ -112,6 +85,8 @@ lib/libudmsearch.a
 lib/libudmsearch.la
 sbin/indexer
 sbin/splitter
+man/man1/indexer.1.gz
+man/man5/indexer.conf.5.gz
 @dirrmtry %%DATADIR%%/create/ibase
 @dirrmtry %%DATADIR%%/create/msql
 @dirrmtry %%DATADIR%%/create/mssql
@@ -124,5 +99,5 @@ sbin/splitter
 @dirrmtry %%DATADIR%%/create/virtuoso
 @dirrmtry %%DATADIR%%/create
 @dirrmtry %%DATADIR%%
-@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry etc/udmsearch