Upgrade to 2.14.

Changelog at <http://billposer.org/Software/unidesc.html#changelog>.

8 files changed, 26 insertions, 76 deletions

diff --git a/sysutils/unidesc/Makefile b/sysutils/unidesc/Makefile
index d6bd47dee997..f8f7cfd70172 100644
--- a/sysutils/unidesc/Makefile
+++ b/sysutils/unidesc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	unidesc
-PORTVERSION=	2.13
+PORTVERSION=	2.14
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 EXTRACT_SUFX=	.tgz
@@ -14,28 +14,29 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Description Utilities
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"		\
+		LIBS="-lintl"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 
-TESTFILES=	TestData/Test1.ann TestData/Test1.u TestData/Test2.ann	\
-		TestData/Test2.u TestData/Test3.ann TestData/Test3.u	\
-		TestData/Test4.ann TestData/Test4.u
-DEMOS=		demo.jpg demo.u demo32.u
-PORTDOCS=	README
+TESTFILES=	Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u	\
+		Test4.ann Test4.u
+PORTDOCS=	AUTHORS NEWS README
 
 MAN1=		unidesc.1 uniname.1 ExplicateUTF8.1 unihist.1
 
 pre-configure:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|;s|%%LOCALBASE%%|${LOCALBASE}|'	\
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${DEMOS:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/TestData/|} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/unidesc/distinfo b/sysutils/unidesc/distinfo
index 01776576e629..4ee7f655fd09 100644
--- a/sysutils/unidesc/distinfo
+++ b/sysutils/unidesc/distinfo
@@ -1,2 +1,2 @@
-MD5 (unidesc-2.13.tgz) = 8f16247f32f137c4e5db72741205547a
-SIZE (unidesc-2.13.tgz) = 205142
+MD5 (unidesc-2.14.tgz) = a9d93f389e1a882880268c7c4a3c1ee0
+SIZE (unidesc-2.14.tgz) = 229136
diff --git a/sysutils/unidesc/files/patch-Makefile b/sysutils/unidesc/files/patch-Makefile
deleted file mode 100644
index d6b0d6826ba5..000000000000
--- a/sysutils/unidesc/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	Sun Jan  9 20:55:19 2005
-+++ Makefile	Sun May 15 16:11:22 2005
-@@ -5,8 +5,9 @@
- BINOBJS= unidesc.o uniname.o unames.o ExplicateUTF8.o unihist.o
- MANS= unidesc.1 uniname.1 ExplicateUTF8.1 unihist.1
- 
--CFLAGS= -pedantic -O
--CC=gcc
-+CFLAGS+= -pedantic -I%%LOCALBASE%%/include
-+LDFLAGS+= -L%%LOCALBASE%%/lib -lintl
-+# CC=gcc
- 
- all:		${BINS}
- 
-@@ -42,7 +43,7 @@
- 				${CC} -c ${CFLAGS} unihist.c
- 
- unihist:			unihist.o Get_UTF32_From_UTF8.o  putu8.o
--				${CC} -o unihist unihist.o Get_UTF32_From_UTF8.o putu8.o
-+				${CC} -o unihist unihist.o Get_UTF32_From_UTF8.o putu8.o ${LDFLAGS}
- 
- 
- ExplicateUTF8.o:		ExplicateUTF8.c
diff --git a/sysutils/unidesc/pkg-plist b/sysutils/unidesc/pkg-plist
index b51d319af36e..52fe8e96a04c 100644
--- a/sysutils/unidesc/pkg-plist
+++ b/sysutils/unidesc/pkg-plist
@@ -10,7 +10,4 @@ bin/uniname
 %%PORTDOCS%%%%EXAMPLESDIR%%/Test3.u
 %%PORTDOCS%%%%EXAMPLESDIR%%/Test4.ann
 %%PORTDOCS%%%%EXAMPLESDIR%%/Test4.u
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo.jpg
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo.u
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo32.u
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/sysutils/uniutils/Makefile b/sysutils/uniutils/Makefile
index d6bd47dee997..f8f7cfd70172 100644
--- a/sysutils/uniutils/Makefile
+++ b/sysutils/uniutils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	unidesc
-PORTVERSION=	2.13
+PORTVERSION=	2.14
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 EXTRACT_SUFX=	.tgz
@@ -14,28 +14,29 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Description Utilities
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"		\
+		LIBS="-lintl"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 
-TESTFILES=	TestData/Test1.ann TestData/Test1.u TestData/Test2.ann	\
-		TestData/Test2.u TestData/Test3.ann TestData/Test3.u	\
-		TestData/Test4.ann TestData/Test4.u
-DEMOS=		demo.jpg demo.u demo32.u
-PORTDOCS=	README
+TESTFILES=	Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u	\
+		Test4.ann Test4.u
+PORTDOCS=	AUTHORS NEWS README
 
 MAN1=		unidesc.1 uniname.1 ExplicateUTF8.1 unihist.1
 
 pre-configure:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|;s|%%LOCALBASE%%|${LOCALBASE}|'	\
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${DEMOS:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/TestData/|} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/uniutils/distinfo b/sysutils/uniutils/distinfo
index 01776576e629..4ee7f655fd09 100644
--- a/sysutils/uniutils/distinfo
+++ b/sysutils/uniutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (unidesc-2.13.tgz) = 8f16247f32f137c4e5db72741205547a
-SIZE (unidesc-2.13.tgz) = 205142
+MD5 (unidesc-2.14.tgz) = a9d93f389e1a882880268c7c4a3c1ee0
+SIZE (unidesc-2.14.tgz) = 229136
diff --git a/sysutils/uniutils/files/patch-Makefile b/sysutils/uniutils/files/patch-Makefile
deleted file mode 100644
index d6b0d6826ba5..000000000000
--- a/sysutils/uniutils/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	Sun Jan  9 20:55:19 2005
-+++ Makefile	Sun May 15 16:11:22 2005
-@@ -5,8 +5,9 @@
- BINOBJS= unidesc.o uniname.o unames.o ExplicateUTF8.o unihist.o
- MANS= unidesc.1 uniname.1 ExplicateUTF8.1 unihist.1
- 
--CFLAGS= -pedantic -O
--CC=gcc
-+CFLAGS+= -pedantic -I%%LOCALBASE%%/include
-+LDFLAGS+= -L%%LOCALBASE%%/lib -lintl
-+# CC=gcc
- 
- all:		${BINS}
- 
-@@ -42,7 +43,7 @@
- 				${CC} -c ${CFLAGS} unihist.c
- 
- unihist:			unihist.o Get_UTF32_From_UTF8.o  putu8.o
--				${CC} -o unihist unihist.o Get_UTF32_From_UTF8.o putu8.o
-+				${CC} -o unihist unihist.o Get_UTF32_From_UTF8.o putu8.o ${LDFLAGS}
- 
- 
- ExplicateUTF8.o:		ExplicateUTF8.c
diff --git a/sysutils/uniutils/pkg-plist b/sysutils/uniutils/pkg-plist
index b51d319af36e..52fe8e96a04c 100644
--- a/sysutils/uniutils/pkg-plist
+++ b/sysutils/uniutils/pkg-plist
@@ -10,7 +10,4 @@ bin/uniname
 %%PORTDOCS%%%%EXAMPLESDIR%%/Test3.u
 %%PORTDOCS%%%%EXAMPLESDIR%%/Test4.ann
 %%PORTDOCS%%%%EXAMPLESDIR%%/Test4.u
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo.jpg
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo.u
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo32.u
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%