Hi --
On 2/5/19 9:50 AM, George Rosamond wrote:
George Rosamond:
Updated from 0.21.9 plus fixed formatting of Makefile and DESCR.
Also bumped automake version to 1.15.
Resubmitting with diff attached and not inline, without bumping automake.
If we're going to go the reformatting the Makefile route, we might as
well go all the way.
That whole auto* dance can go away too; since 0.21.9 there have been no
symlinks in the config directory.
I'm not sure what's wrong with DESCR? It looks fine to me and wraps at
72 characters.
New patch looks like the attached.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/unrtf/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 30 Dec 2014 15:02:32 -0000 1.14
+++ Makefile 6 Feb 2019 13:47:57 -0000
@@ -1,37 +1,22 @@
-# $OpenBSD: Makefile,v 1.14 2014/12/30 15:02:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2016/04/09 20:14:49 naddy Exp $
-COMMENT= RTF document converter
+COMMENT = RTF document converter
+DISTNAME = unrtf-0.21.10
+CATEGORIES = textproc
-DISTNAME= unrtf-0.21.8
-CATEGORIES= textproc
-
-HOMEPAGE= https://www.gnu.org/software/unrtf/unrtf.html
-
-MASTER_SITES= ${MASTER_SITE_GNU:=unrtf/}
+HOMEPAGE = https://www.gnu.org/software/unrtf/unrtf.html
# GPLv3+
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB += c
-
-MODULES= converters/libiconv
+PERMIT_PACKAGE_CDROM = Yes
-CONFIGURE_STYLE= gnu
+WANTLIB += c iconv
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv"
+MASTER_SITES = ${MASTER_SITE_GNU:=unrtf/}
-# rm/bootstrap are only done because of symlinks to /usr/share/auto*
-# in ${WRKSRC}/config for missing/etc.
-#
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.11
+LIB_DEPENDS = converters/libiconv
-post-patch:
- rm ${WRKSRC}/config/*
- cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./bootstrap
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -liconv"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/unrtf/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 27 Apr 2015 18:20:47 -0000 1.6
+++ distinfo 6 Feb 2019 13:47:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (unrtf-0.21.9.tar.gz) = IqN4JvltdU4zX7afgDbAaMAN0B7p7dlGGjbfAIX7jd0=
-SIZE (unrtf-0.21.9.tar.gz) = 828590
+SHA256 (unrtf-0.21.10.tar.gz) = tJ8gIR+mn/+X1C1ueCpi1+LaZwsGSVHxS7/5aMk3NK4=
+SIZE (unrtf-0.21.10.tar.gz) = 812696
