Date: Tue, 15 Jan 2013 13:59:01 +0800 (CST) From: Po-Chien Lin <linpc@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@freebsd.org Cc: hsmtkk@gmail.com Subject: ports/175315: [PATCH] textproc/mxml: update to 2.7 Message-ID: <20130115055901.5D2F63999C@dev.linpc.org> Resent-Message-ID: <201301150600.r0F601pV000345@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175315
>Category: ports
>Synopsis: [PATCH] textproc/mxml: update to 2.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 15 06:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Po-Chien Lin
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dev.linpc.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Sat Jan 5 22:32:49 CST
>Description:
- Update to 2.7
- Add custom LICENSE MXML
- Add USE_LDCONFIG to include new shared library
- Switch to OptionsNG
- Change DOCS installing hierarchy from ${DOCSDIR}/doc/ to ${DOCSDIR}/
- Remove unused patch (have been merged into upstream)
- Cleanup TAB in pkg-descr
Removed file(s):
- files/patch-mxmldoc.c
>How-To-Repeat:
>Fix:
--- mxml-2.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/mxml/Makefile ./Makefile
--- /usr/ports/textproc/mxml/Makefile 2013-01-05 21:28:03.719266674 +0800
+++ ./Makefile 2013-01-15 13:40:32.688893117 +0800
@@ -1,12 +1,8 @@
-# New ports collection makefile for: mxml
-# Date created: 2007-10-12
-# Whom: Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
# $FreeBSD: head/textproc/mxml/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
PORTNAME= mxml
-PORTVERSION= 2.6
+PORTVERSION= 2.7
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= mxml/${PORTVERSION}
@@ -14,12 +10,18 @@
MAINTAINER= hsmtkk@gmail.com
COMMENT= Small XML parsing library
+LICENSE= MXML
+LICENSE_NAME= Mini-XML License
+LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
CONFIGURE_ARGS= --with-docdir=no
MAKE_JOBS_SAFE= yes
+USE_LDCONFIG= yes
MAN1= mxmldoc.1
MAN3= mxml.3
@@ -28,12 +30,15 @@
PLIST_FILES= bin/mxmldoc include/mxml.h \
lib/libmxml.a \
+ lib/libmxml.so lib/libmxml.so.1 lib/libmxml.so.1.5 \
libdata/pkgconfig/mxml.pc
+.include <bsd.port.options.mk>
+
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
- @${CP} -R ${PORTDOCS:S,^,${WRKSRC}/doc,} ${DOCSDIR}
+ (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR})
.endif
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/textproc/mxml/distinfo ./distinfo
--- /usr/ports/textproc/mxml/distinfo 2013-01-05 21:28:03.719266674 +0800
+++ ./distinfo 2013-01-15 11:15:43.863648383 +0800
@@ -1,2 +1,2 @@
-SHA256 (mxml-2.6.tar.gz) = b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795
-SIZE (mxml-2.6.tar.gz) = 254455
+SHA256 (mxml-2.7.tar.gz) = a77200ee4c1e1cf2eb531595ec17ce31805760699d260915496c39d3388eb803
+SIZE (mxml-2.7.tar.gz) = 262027
diff -ruN --exclude=CVS /usr/ports/textproc/mxml/files/patch-libtool22 ./files/patch-libtool22
--- /usr/ports/textproc/mxml/files/patch-libtool22 2013-01-05 21:28:03.719266674 +0800
+++ ./files/patch-libtool22 2013-01-15 11:21:34.520441135 +0800
@@ -1,6 +1,6 @@
--- Makefile.in.orig 2009-07-14 23:48:58.000000000 -0500
+++ Makefile.in 2009-07-14 23:49:34.000000000 -0500
-@@ -59,10 +59,10 @@
+@@ -57,10 +57,10 @@
# Install commands...
#
diff -ruN --exclude=CVS /usr/ports/textproc/mxml/files/patch-mxmldoc.c ./files/patch-mxmldoc.c
--- /usr/ports/textproc/mxml/files/patch-mxmldoc.c 2013-01-05 21:28:03.728620080 +0800
+++ ./files/patch-mxmldoc.c 1970-01-01 08:00:00.000000000 +0800
@@ -1,10 +0,0 @@
---- mxmldoc.c.orig 2009-07-25 13:08:26.603202123 +0900
-+++ mxmldoc.c 2009-07-25 13:08:37.818332350 +0900
-@@ -57,7 +57,6 @@
- #ifndef WIN32
- # include <dirent.h>
- # include <unistd.h>
--# include <spawn.h>
- # include <sys/wait.h>
- extern char **environ;
- #endif /* !WIN32 */
diff -ruN --exclude=CVS /usr/ports/textproc/mxml/pkg-descr ./pkg-descr
--- /usr/ports/textproc/mxml/pkg-descr 2013-01-05 21:28:03.719266674 +0800
+++ ./pkg-descr 2013-01-15 12:53:44.253817401 +0800
@@ -2,4 +2,4 @@
read XML and XML-like data files in your application without
requiring large non-standard libraries.
-WWW: http://www.minixml.org/
+WWW: http://www.minixml.org/
--- mxml-2.7.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130115055901.5D2F63999C>