Update to 1.0.0

PR:		based on ports/150311
Submitted by:	Alex Samorukov (maintainer)

4 files changed, 99 insertions, 14 deletions

diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile
index 4bfbcb8ebaaa..e8fa5536e392 100644
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cuneiform
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	https://launchpad.net/cuneiform-linux/${PORTVERSION:R}/${PORTVERSION:R}/+download/
+MASTER_SITES=	http://launchpadlibrarian.net/51166054/
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
 
 MAINTAINER=	samm@os2.kiev.ua
@@ -20,9 +19,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-linux-${PORTVERSION}/build
-CMAKE_SOURCE_PATH=..
+CMAKE_OUTSOURCE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
@@ -44,14 +41,18 @@ post-extract:
 	${MKDIR} ${WRKSRC}
 
 post-patch:
+	${MV} ${WRKSRC}/cuneiform_src/Kern/hrstr/strings.h \
+		${WRKSRC}/cuneiform_src/Kern/hrstr/cf_strings.h
+	${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \
+		${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h
 .if !defined(WITH_IMAGEMAGICK)
 	@${REINPLACE_CMD} -e '/pkg_check_modules.*ImageMagick/ d' \
-		${WRKSRC}/../cuneiform_src/Kern/CMakeLists.txt
+		${WRKSRC}/cuneiform_src/Kern/CMakeLists.txt
 .endif
 .if ${OSVERSION} < 700000
 	@${REINPLACE_CMD} -e 's|malloc_np.h|dlmalloc/malloc.h|' \
-		${WRKSRC}/../cuneiform_src/Kern/cfcompat/cfcompat.c \
-		${WRKSRC}/../cuneiform_src/Kern/rbal/src/statsearchbl.cpp
+		${WRKSRC}/cuneiform_src/Kern/cfcompat/cfcompat.c \
+		${WRKSRC}/cuneiform_src/Kern/rbal/src/statsearchbl.cpp
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/cuneiform/distinfo b/graphics/cuneiform/distinfo
index 4f25146a5622..8c3ce238fcda 100644
--- a/graphics/cuneiform/distinfo
+++ b/graphics/cuneiform/distinfo
@@ -1,3 +1,3 @@
-MD5 (cuneiform-linux-0.8.0.tar.bz2) = 271c1adae56bf8b977bf7326f8a8a0bc
-SHA256 (cuneiform-linux-0.8.0.tar.bz2) = 874e9078fa41d6bd21e7b419ad931f9bf88ad61f8d3da4b7464d8cdb52c7be8f
-SIZE (cuneiform-linux-0.8.0.tar.bz2) = 26816146
+MD5 (cuneiform-linux-1.0.0.tar.bz2) = 785232ffffad7d82446fbac08a1c3ef9
+SHA256 (cuneiform-linux-1.0.0.tar.bz2) = bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e
+SIZE (cuneiform-linux-1.0.0.tar.bz2) = 26387208
diff --git a/graphics/cuneiform/files/patch-strings.h b/graphics/cuneiform/files/patch-strings.h
new file mode 100644
index 000000000000..72b7d6df77e9
--- /dev/null
+++ b/graphics/cuneiform/files/patch-strings.h
@@ -0,0 +1,37 @@
+--- cuneiform_src/Kern/hhh/tigerh/h/c_types.h	2010-06-30 13:54:18.000000000 +0300
++++ cuneiform_src/Kern/hhh/tigerh/h/c_types.h	2010-09-06 03:21:03.000000000 +0300
+@@ -79,12 +79,6 @@
+ /*--------------------- Include standart h-files -----------------------*/
+ 
+ #include <stdio.h>
+-
+-/* solves conflict with bsd <strings.h> */
+-#if defined(__FreeBSD__)
+-#undef __BSD_VISIBLE
+-#endif
+-
+ #include <string.h>
+ 
+ #include "cttypes.h"
+--- cuneiform_src/Kern/hhh/tigerh/h/extract.h	2010-06-30 13:54:25.000000000 +0300
++++ cuneiform_src/Kern/hhh/tigerh/h/extract.h	2010-09-06 03:21:12.000000000 +0300
+@@ -83,7 +83,7 @@
+ # include "c_types.h"
+ # include "lterrors.h"
+ # include "roots.h"
+-# include "strings.h"
++# include "cf_strings.h"
+ # include "madebug.h"
+ # include "layout.h"
+ 
+--- cuneiform_src/Kern/hrstr/extract.h	2010-06-30 13:54:25.000000000 +0300
++++ cuneiform_src/Kern/hrstr/extract.h	2010-09-06 03:20:48.000000000 +0300
+@@ -72,7 +72,7 @@
+ 
+ # include "lterrors.h"
+ # include "roots.h"
+-# include "strings.h"
++# include "cf_strings.h"
+ # include "madebug.h"
+ # include "layout.h"
+ 
diff --git a/graphics/cuneiform/pkg-plist b/graphics/cuneiform/pkg-plist
index abbb712ae9e5..a22c68c0fc4f 100644
--- a/graphics/cuneiform/pkg-plist
+++ b/graphics/cuneiform/pkg-plist
@@ -1,50 +1,97 @@
 bin/cuneiform
+include/cuneiform.h
 lib/libccom.so
+lib/libccom.so.1.0.0
 lib/libced.so
+lib/libced.so.1.0.0
+lib/libcfcompat.so
+lib/libcfcompat.so.1.0.0
 lib/libcfio.so
+lib/libcfio.so.1.0.0
 lib/libcimage.so
+lib/libcimage.so.1.0.0
 lib/libcline.so
+lib/libcline.so.1.0.0
 lib/libcpage.so
+lib/libcpage.so.1.0.0
 lib/libcpu32.so
+lib/libcpu32.so.1.0.0
 lib/libcstr.so
+lib/libcstr.so.1.0.0
 lib/libctb32.so
+lib/libctb32.so.1.0.0
+lib/libcuneiform.so
+lib/libcuneiform.so.1.0.0
 lib/libdif32.so
+lib/libdif32.so.1.0.0
 lib/libevn32.so
+lib/libevn32.so.1.0.0
 lib/libexc.so
+lib/libexc.so.1.0.0
 lib/libfon32.so
+lib/libfon32.so.1.0.0
 lib/libleo32.so
+lib/libleo32.so.1.0.0
 lib/liblns32.so
+lib/liblns32.so.1.0.0
 lib/libloc32.so
+lib/libloc32.so.1.0.0
 lib/libmmx32.so
+lib/libmmx32.so.1.0.0
 lib/libmsk32.so
+lib/libmsk32.so.1.0.0
 lib/libpass2.so
-lib/libpuma.so
+lib/libpass2.so.1.0.0
 lib/libr3532.so
+lib/libr3532.so.1.0.0
 lib/librbal.so
+lib/librbal.so.1.0.0
 lib/librblock.so
+lib/librblock.so.1.0.0
 lib/librcorrkegl.so
+lib/librcorrkegl.so.1.0.0
 lib/librcutp.so
+lib/librcutp.so.1.0.0
 lib/librdib.so
+lib/librdib.so.1.0.0
 lib/librfrmt.so
+lib/librfrmt.so.1.0.0
 lib/librimage.so
+lib/librimage.so.1.0.0
 lib/librline.so
+lib/librline.so.1.0.0
 lib/librling.so
+lib/librling.so.1.0.0
 lib/librlings.so
+lib/librlings.so.1.0.0
 lib/librmarker.so
+lib/librmarker.so.1.0.0
 lib/librneg.so
+lib/librneg.so.1.0.0
 lib/librout.so
+lib/librout.so.1.0.0
 lib/librpic.so
+lib/librpic.so.1.0.0
 lib/librpstr.so
+lib/librpstr.so.1.0.0
 lib/librreccom.so
+lib/librreccom.so.1.0.0
 lib/librsadd.so
+lib/librsadd.so.1.0.0
 lib/librselstr.so
+lib/librselstr.so.1.0.0
 lib/librshelllines.so
+lib/librshelllines.so.1.0.0
 lib/librstr.so
+lib/librstr.so.1.0.0
 lib/librstuff.so
+lib/librstuff.so.1.0.0
 lib/librverline.so
+lib/librverline.so.1.0.0
 lib/libsmetric.so
+lib/libsmetric.so.1.0.0
 lib/libstd32.so
-lib/libcfcompat.so
+lib/libstd32.so.1.0.0
 %%DATADIR%%/cube16pd.dat
 %%DATADIR%%/cube16pl.dat
 %%DATADIR%%/cube16pr.dat