- Update to 1.2.0

- Remove files/patch-Makefile.am

PR:		90197
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 29 insertions, 57 deletions

diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index 780a861ea508..e4d94b8c905a 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -6,39 +6,28 @@
 #
 
 PORTNAME=	sary
-PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTVERSION=	1.2.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://prime.sourceforge.jp/freebsd/
+MASTER_SITES=	http://sary.sourceforge.net/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A suffix array library and tools, which provide fast full-text search
 
-CONFIGURE_DEPENDS=	${BUILD_DEPENDS}
-
-USE_GNOME=	glib20 gnomehack
+USE_GNOME=	glib20 gnomehack gnometarget
 USE_REINPLACE=	yes
-
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:13
-AUTOMAKE_ARGS=	-a
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 MAN1=		sary.1	mksary.1
 
-pre-configure:
-.if !defined(NOPORTDOCS)
-	${FIND} ${WRKSRC}/docs -type f -name 'Makefile.am' | \
-		${XARGS} ${REINPLACE_CMD} \
-		-e 's,^docsdir = .*,docsdir = \$$(datadir)/doc/sary,'
-.endif
-	cd ${WRKSRC} && ${ACLOCAL}
-	${REINPLACE_CMD} -e 's,--no-verify,,' ${WRKSRC}/aclocal.m4
-	cd ${WRKSRC} && ${LIBTOOLIZE} && ${AUTOHEADER}
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/docs; ${MAKE} install
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${FIND} . ! -name "*Makefile*" | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/sary/distinfo b/textproc/sary/distinfo
index 7266bb5b68d9..5f4e58a945b7 100644
--- a/textproc/sary/distinfo
+++ b/textproc/sary/distinfo
@@ -1,3 +1,3 @@
-MD5 (sary-1.1.0.tar.gz) = 842117e74ec01756d86ef9201ccef0af
-SHA256 (sary-1.1.0.tar.gz) = 67f15d17c1b3633d251e9350417605e0db767443726ea643361d34acaf6ffb12
-SIZE (sary-1.1.0.tar.gz) = 216326
+MD5 (sary-1.2.0.tar.gz) = 10b9a803025c5f428014a7f1ff849ecc
+SHA256 (sary-1.2.0.tar.gz) = d4b16e32c97a253b546922d2926c8600383352f0af0d95e2938b6d846dfc6a11
+SIZE (sary-1.2.0.tar.gz) = 393787
diff --git a/textproc/sary/files/patch-Makefile.am b/textproc/sary/files/patch-Makefile.am
deleted file mode 100644
index 6228c57c688b..000000000000
--- a/textproc/sary/files/patch-Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.am.orig	Tue Oct 22 11:18:18 2002
-+++ Makefile.am	Mon Sep 15 00:32:46 2003
-@@ -5,11 +5,11 @@
- 
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
- 
--SUBDIRS = . docs man sary src tests debian
-+SUBDIRS = . man sary src
- 
- include_HEADERS = sary.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = sary.pc
- 
- EXTRA_DIST  =	sary.pc.in sary.spec.in sary.spec
diff --git a/textproc/sary/pkg-descr b/textproc/sary/pkg-descr
index 16e1b402fd3e..79c19fb5b805 100644
--- a/textproc/sary/pkg-descr
+++ b/textproc/sary/pkg-descr
@@ -4,4 +4,4 @@ data structure called a suffix array.  It can also search specific
 fields in a text file by assigning index points to those fields.
 
 Author:	Satoru Takabayashi <satoru@namazu.org>
-WWW:	http://sary.namazu.org/index.html.en
+WWW:	http://sary.sourceforge.net/index.html.en
diff --git a/textproc/sary/pkg-plist b/textproc/sary/pkg-plist
index 07b26d837b09..648ec8584bca 100644
--- a/textproc/sary/pkg-plist
+++ b/textproc/sary/pkg-plist
@@ -17,23 +17,22 @@ include/sary/sorter.h
 include/sary/str.h
 include/sary/text.h
 include/sary/writer.h
-@dirrm include/sary
 lib/libsary.a
-lib/libsary.la
 lib/libsary.so
-lib/libsary.so.9
+lib/libsary.so.10
 libdata/pkgconfig/sary.pc
-%%PORTDOCS%%share/doc/sary/en/libsary.html
-%%PORTDOCS%%share/doc/sary/en/suffix-array.html
-%%PORTDOCS%%share/doc/sary/images/figure1.png
-%%PORTDOCS%%share/doc/sary/images/figure2.png
-%%PORTDOCS%%share/doc/sary/images/figure3.png
-%%PORTDOCS%%share/doc/sary/images/figure4.png
-%%PORTDOCS%%share/doc/sary/images/figure5.png
-%%PORTDOCS%%share/doc/sary/ja/libsary.html
-%%PORTDOCS%%share/doc/sary/ja/suffix-array.html
-%%PORTDOCS%%share/doc/sary/sary.css
-%%PORTDOCS%%@dirrm share/doc/sary/en
-%%PORTDOCS%%@dirrm share/doc/sary/images
-%%PORTDOCS%%@dirrm share/doc/sary/ja
-%%PORTDOCS%%@dirrm share/doc/sary
+%%PORTDOCS%%%%DOCSDIR%%/en/libsary.html
+%%PORTDOCS%%%%DOCSDIR%%/en/suffix-array.html
+%%PORTDOCS%%%%DOCSDIR%%/images/figure1.png
+%%PORTDOCS%%%%DOCSDIR%%/images/figure2.png
+%%PORTDOCS%%%%DOCSDIR%%/images/figure3.png
+%%PORTDOCS%%%%DOCSDIR%%/images/figure4.png
+%%PORTDOCS%%%%DOCSDIR%%/images/figure5.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/libsary.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/suffix-array.html
+%%PORTDOCS%%%%DOCSDIR%%/sary.css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/sary