Hi ports --
Attached is an update for textproc/mxml, bringing it to 2.8, its latest
version. (I'll take maintainer as well.)
I need this for a new port.
Tests good on amd64 and loongson.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/mxml/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 11 Mar 2013 11:42:42 -0000 1.8
+++ Makefile 23 Jan 2014 06:46:41 -0000
@@ -1,21 +1,20 @@
# $OpenBSD: Makefile,v 1.8 2013/03/11 11:42:42 espie Exp $
COMMENT= minimal XML library
-
-DISTNAME= mxml-2.5
-REVISION= 2
+DISTNAME= mxml-2.8
CATEGORIES= textproc
-SHARED_LIBS= mxml 0.1 # 1.4
+SHARED_LIBS= mxml 0.2 # 1.5
-HOMEPAGE= http://www.easysw.com/~mike/mxml/
+HOMEPAGE= http://www.msweet.org/projects.php?Z3
+MAINTAINER= Brian Callahan <bcal...@openbsd.org>
-# LGPLv2
+# LGPLv2 with exceptions
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
-MASTER_SITES= ftp://ftp.easysw.com/pub/mxml/2.5/
+MASTER_SITES= http://www.msweet.org/files/project3/
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --disable-threads
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/mxml/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 17 Jan 2009 20:28:27 -0000 1.2
+++ distinfo 23 Jan 2014 06:46:41 -0000
@@ -1,5 +1,2 @@
-MD5 (mxml-2.5.tar.gz) = 9wY3f7pjCzn6Av1jZCsX5Q==
-RMD160 (mxml-2.5.tar.gz) = qjFetJksOt1f+8trALhU2CZ3qXE=
-SHA1 (mxml-2.5.tar.gz) = S4FtwS3uhAQgd2+nLsxB1XXKVMw=
-SHA256 (mxml-2.5.tar.gz) = rvBUHQWJvjUMUMf+W8caDrEEbQ849rJzSLY8qiGuvHk=
-SIZE (mxml-2.5.tar.gz) = 247768
+SHA256 (mxml-2.8.tar.gz) = DJNp+RpxjYLjLLAHwL1BtmQoIsmg/+HRDsy96powEdU=
+SIZE (mxml-2.8.tar.gz) = 264044
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/mxml/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 17 Jan 2009 20:28:28 -0000 1.2
+++ patches/patch-Makefile_in 23 Jan 2014 06:46:41 -0000
@@ -1,40 +1,42 @@
$OpenBSD: patch-Makefile_in,v 1.2 2009/01/17 20:28:28 jakemsr Exp $
---- Makefile.in.orig Tue Nov 18 06:25:18 2008
-+++ Makefile.in Tue Nov 18 07:55:52 2008
-@@ -143,13 +143,13 @@ install-libmxml.a:
+--- Makefile.in.orig Thu Jan 23 01:28:45 2014
++++ Makefile.in Thu Jan 23 01:32:15 2014
+@@ -166,14 +166,14 @@ install-libmxml.a:
$(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
$(RANLIB) $(BUILDROOT)$(libdir)/libmxml.a
--install-libmxml.so.1.4:
+-install-libmxml.so.1.5:
+install-libmxml.so.$(LIBmxml_VERSION):
+ echo Installing libmxml.so to $(BUILDROOT)$(libdir)...
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-- $(INSTALL_LIB) libmxml.so.1.4 $(BUILDROOT)$(libdir)
+- $(INSTALL_LIB) libmxml.so.1.5 $(BUILDROOT)$(libdir)
- $(RM) $(BUILDROOT)$(libdir)/libmxml.so
-- $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so
+- $(LN) libmxml.so.1.5 $(BUILDROOT)$(libdir)/libmxml.so
- $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
-- $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so.1
+- $(LN) libmxml.so.1.5 $(BUILDROOT)$(libdir)/libmxml.so.1
+ $(INSTALL_LIB) libmxml.so.$(LIBmxml_VERSION) $(BUILDROOT)$(libdir)
+# $(RM) $(BUILDROOT)$(libdir)/libmxml.so
-+# $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so
++# $(LN) libmxml.so.1.5 $(BUILDROOT)$(libdir)/libmxml.so
+# $(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
-+# $(LN) libmxml.so.1.4 $(BUILDROOT)$(libdir)/libmxml.so.1
++# $(LN) libmxml.so.1.5 $(BUILDROOT)$(libdir)/libmxml.so.1
install-libmxml.sl.1:
- $(INSTALL_DIR) $(BUILDROOT)$(libdir)
-@@ -244,11 +244,11 @@ mxml-entity.o mxml-file.o mxml-private.o: mxml-private
- # libmxml.so.1.4
+ echo Installing libmxml.sl to $(BUILDROOT)$(libdir)...
+@@ -295,12 +295,12 @@ mxml-entity.o mxml-file.o mxml-private.o: mxml-private
+ # libmxml.so.1.5
#
--libmxml.so.1.4: $(LIBOBJS)
-- $(DSO) $(DSOFLAGS) -o libmxml.so.1.4 $(LIBOBJS)
-- $(RM) libmxml.so libmxml.so.1
-- $(LN) libmxml.so.1.4 libmxml.so
-- $(LN) libmxml.so.1.4 libmxml.so.1
+-libmxml.so.1.5: $(LIBOBJS)
+libmxml.so.$(LIBmxml_VERSION): $(LIBOBJS)
+ echo Creating $@...
+- $(DSO) $(DSOFLAGS) -o libmxml.so.1.5 $(LIBOBJS)
+- $(RM) libmxml.so libmxml.so.1
+- $(LN) libmxml.so.1.5 libmxml.so
+- $(LN) libmxml.so.1.5 libmxml.so.1
+ $(DSO) $(DSOFLAGS) -o libmxml.so.$(LIBmxml_VERSION) $(LIBOBJS)
+# $(RM) libmxml.so libmxml.so.1
-+# $(LN) libmxml.so.1.4 libmxml.so
-+# $(LN) libmxml.so.1.4 libmxml.so.1
++# $(LN) libmxml.so.1.5 libmxml.so
++# $(LN) libmxml.so.1.5 libmxml.so.1
#
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/textproc/mxml/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 17 Jan 2009 20:28:28 -0000 1.2
+++ patches/patch-configure 23 Jan 2014 06:46:41 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.2 2009/01/17 20:28:28 jakemsr Exp $
---- configure.orig Sat Jan 26 12:50:28 2008
-+++ configure Mon Jan 12 00:26:29 2009
-@@ -4661,10 +4661,10 @@ echo "${ECHO_T}yes" >&6; }
+--- configure.orig Thu Jan 23 01:32:39 2014
++++ configure Thu Jan 23 01:33:54 2014
+@@ -4315,10 +4315,10 @@ $as_echo "yes" >&6; }
*BSD*)
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-- LIBMXML="libmxml.so.1.4"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- LIBMXML="libmxml.so.1.5"
+ LIBMXML="libmxml.so.${LIBmxml_VERSION}"
DSO="\$(CC)"
- DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
@@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.2 2009/01/
;;
Darwin*)
-@@ -4698,7 +4698,7 @@ if test -n "$GCC"; then
+@@ -4352,7 +4352,7 @@ if test -n "$GCC"; then
CFLAGS="-Wall $CFLAGS"
if test "x$OPTIM" = x; then
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 1 Oct 2007 18:40:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/10/01 18:40:11 jakemsr Exp $
-@lib lib/libmxml.so.${LIBmxml_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/mxml/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 17 Jan 2009 20:28:28 -0000 1.2
+++ pkg/PLIST 23 Jan 2014 06:46:41 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2009/01/17 20:28:28 jakemsr Exp $
-%%SHARED%%
@bin bin/mxmldoc
include/mxml.h
lib/libmxml.a
+@lib lib/libmxml.so.${LIBmxml_VERSION}
lib/pkgconfig/
lib/pkgconfig/mxml.pc
@man man/man1/mxmldoc.1
