[Midnightbsd-cvs] mports [16066] new man page format

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 16 21:51:17 EDT 2014 

Revision: 16066
          http://svnweb.midnightbsd.org/mports/?rev=16066
Author:   laffer1
Date:     2014-03-16 21:51:16 -0400 (Sun, 16 Mar 2014)
Log Message:
-----------
new man page format

Modified Paths:
--------------
    trunk/textproc/libxml2/Makefile
    trunk/textproc/libxml2/files/patch-xml2Conf.sh.in
    trunk/textproc/libxml2/pkg-plist

Added Paths:
-----------
    trunk/textproc/libxml2/files/patch-encoding.c
    trunk/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
    trunk/textproc/libxml2/files/patch-libxml-2.0.pc.in

Property Changed:
----------------
    trunk/textproc/libxml2/files/patch-Makefile.in
    trunk/textproc/libxml2/files/patch-config.h.in
    trunk/textproc/libxml2/files/patch-configure
    trunk/textproc/libxml2/files/patch-doc_devhelp_Makefile.in
    trunk/textproc/libxml2/files/patch-include_libxml_parser.h
    trunk/textproc/libxml2/files/patch-parser.c
    trunk/textproc/libxml2/files/patch-parserInternals.c
    trunk/textproc/libxml2/files/patch-python_Makefile.in
    trunk/textproc/libxml2/files/patch-python_tests_Makefile.in
    trunk/textproc/libxml2/files/patch-xml2Conf.sh.in
    trunk/textproc/libxml2/pkg-descr

Modified: trunk/textproc/libxml2/Makefile
===================================================================
--- trunk/textproc/libxml2/Makefile	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/Makefile	2014-03-17 01:51:16 UTC (rev 16066)
@@ -2,9 +2,10 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.8.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
+		http://xmlsoft.org/sources/ \
 		ftp://gd.tuwien.ac.at/pub/libxml/
 DIST_SUBDIR=	gnome2
 
@@ -13,68 +14,50 @@
 LICENSE=	bsd3
 
 .if !defined(REFERENCE_PORT)
-
 USE_CSTD=	gnu89
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME?=	gnomehack
-USE_PKGCONFIG=	yes
+USES=		pathfix gmake iconv pkgconfig
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
+CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
 		--with-lzma=/usr \
 		--without-python
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(MASTERDIR)
-MAN1=		xml2-config.1 xmllint.1 xmlcatalog.1
-MAN3=		libxml.3
-
 OPTIONS_DEFINE= SCHEMA THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
 OPTIONS_DEFAULT=SCHEMA THREADS
+
 SCHEMA_DESC=	XML schema support
+SCHEMA_CONFIGURE_WITH=	schemas
 THREADS_DESC=	Threads support
+THREADS_CONFIGURE_WITH=	threads
 MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
+MEM_DEBUG_CONFIGURE_WITH=	mem-debug
 XMLLINT_HIST_DESC= History for xmllint
+XMLLINT_HIST_CONFIGURE_WITH=	history
 THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
-
-.include <bsd.mport.options.mk>
-
-.if ! ${PORT_OPTIONS:MSCHEMA}
-CONFIGURE_ARGS+=	--without-schemas
-.endif
-
-.if ! ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=	--without-threads
-.endif
-
-.if ${PORT_OPTIONS:MMEM_DEBUG}
-CONFIGURE_ARGS+=	--with-mem-debug
-.endif
-
-.if ${PORT_OPTIONS:MXMLLINT_HIST}
-CONFIGURE_ARGS+=	--with-history
-.endif
-
-.if ${PORT_OPTIONS:MTHREAD_ALLOC}
-CONFIGURE_ARGS+=	--with-thread-alloc
-.endif
+THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
 .endif # !defined(MASTERDIR)
 
 post-patch:
 .for d in . doc doc/devhelp doc/examples
 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
-		${WRKSRC}/${d}/Makefile.in
+	    ${WRKSRC}/${d}/Makefile.in
 .endfor
 .for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
 	@${REINPLACE_CMD} -e \
-		's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \
-		 s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' ${WRKSRC}/${f}
+	    's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \
+	     s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \
+	    ${WRKSRC}/${f}
 .endfor
+# manual patch because WITH_FBSD10_FIX break the python bindings
+	${FIND} ${WRKSRC} -type f -name configure \
+		-exec ${SH} -c " \
+		mtime=\$$(date -r \$$(stat -f '%m' \$$0) '+%Y%m%d%H%M.%S'); \
+		${SED} -i '.batman' -e 's|freebsd1\*)|freebsd1.\*)|g' \
+		-e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \$$0; \
+		touch -mt \$$mtime \$$0" {} \; || /usr/bin/true
 
 .include <bsd.port.mk>
 

Index: trunk/textproc/libxml2/files/patch-Makefile.in
===================================================================
--- trunk/textproc/libxml2/files/patch-Makefile.in	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-Makefile.in	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/libxml2/files/patch-config.h.in
===================================================================
--- trunk/textproc/libxml2/files/patch-config.h.in	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-config.h.in	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-config.h.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/textproc/libxml2/files/patch-configure
===================================================================
--- trunk/textproc/libxml2/files/patch-configure	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-configure	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/textproc/libxml2/files/patch-doc_devhelp_Makefile.in
===================================================================
--- trunk/textproc/libxml2/files/patch-doc_devhelp_Makefile.in	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-doc_devhelp_Makefile.in	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-doc_devhelp_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/textproc/libxml2/files/patch-encoding.c
===================================================================
--- trunk/textproc/libxml2/files/patch-encoding.c	                        (rev 0)
+++ trunk/textproc/libxml2/files/patch-encoding.c	2014-03-17 01:51:16 UTC (rev 16066)
@@ -0,0 +1,21 @@
+--- encoding.c.orig	2012-05-08 22:55:13.000000000 +0900
++++ encoding.c	2013-11-22 04:59:54.000000000 +0900
+@@ -1789,13 +1789,18 @@
+     const char *icv_in = (const char *) in;
+     char *icv_out = (char *) out;
+     int ret;
++    int one;
+ 
++    one = 1;
+     if ((out == NULL) || (outlen == NULL) || (inlen == NULL) || (in == NULL)) {
+         if (outlen != NULL) *outlen = 0;
+         return(-1);
+     }
+     icv_inlen = *inlen;
+     icv_outlen = *outlen;
++#ifdef ICONV_SET_ILSEQ_INVALID
++    iconvctl(cd, ICONV_SET_ILSEQ_INVALID, &one);
++#endif
+     ret = iconv(cd, (ICONV_CONST char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen);
+     *inlen -= icv_inlen;
+     *outlen -= icv_outlen;

Index: trunk/textproc/libxml2/files/patch-include_libxml_parser.h
===================================================================
--- trunk/textproc/libxml2/files/patch-include_libxml_parser.h	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-include_libxml_parser.h	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-include_libxml_parser.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
===================================================================
--- trunk/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in	                        (rev 0)
+++ trunk/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in	2014-03-17 01:51:16 UTC (rev 16066)
@@ -0,0 +1,9 @@
+--- libxml-2.0-uninstalled.pc.in.orig	2009-07-30 11:24:34.000000000 -0400
++++ libxml-2.0-uninstalled.pc.in	2013-04-09 15:37:18.000000000 -0400
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
++Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@

Added: trunk/textproc/libxml2/files/patch-libxml-2.0.pc.in
===================================================================
--- trunk/textproc/libxml2/files/patch-libxml-2.0.pc.in	                        (rev 0)
+++ trunk/textproc/libxml2/files/patch-libxml-2.0.pc.in	2014-03-17 01:51:16 UTC (rev 16066)
@@ -0,0 +1,9 @@
+--- libxml-2.0.pc.in.orig	2010-05-14 11:26:41.000000000 -0400
++++ libxml-2.0.pc.in	2013-04-09 15:35:53.000000000 -0400
+@@ -9,5 +9,5 @@
+ Description: libXML library version2.
+ Requires:
+ Libs: -L${libdir} -lxml2
+-Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
++Libs.private: @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
+ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@

Index: trunk/textproc/libxml2/files/patch-parser.c
===================================================================
--- trunk/textproc/libxml2/files/patch-parser.c	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-parser.c	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-parser.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/textproc/libxml2/files/patch-parserInternals.c
===================================================================
--- trunk/textproc/libxml2/files/patch-parserInternals.c	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-parserInternals.c	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-parserInternals.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/libxml2/files/patch-python_Makefile.in
===================================================================
--- trunk/textproc/libxml2/files/patch-python_Makefile.in	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-python_Makefile.in	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-python_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/libxml2/files/patch-python_tests_Makefile.in
===================================================================
--- trunk/textproc/libxml2/files/patch-python_tests_Makefile.in	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-python_tests_Makefile.in	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/files/patch-python_tests_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/textproc/libxml2/files/patch-xml2Conf.sh.in
===================================================================
--- trunk/textproc/libxml2/files/patch-xml2Conf.sh.in	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/files/patch-xml2Conf.sh.in	2014-03-17 01:51:16 UTC (rev 16066)
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: head/textproc/libxml2/files/patch-xml2Conf.sh.in 340725 2014-01-22 17:40:44Z mat $
 
 --- xml2Conf.sh.in	2001/05/19 19:57:43	1.1
 +++ xml2Conf.sh.in	2001/05/19 19:59:40


Property changes on: trunk/textproc/libxml2/files/patch-xml2Conf.sh.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/textproc/libxml2/pkg-descr
===================================================================
--- trunk/textproc/libxml2/pkg-descr	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/pkg-descr	2014-03-17 01:51:16 UTC (rev 16066)

Property changes on: trunk/textproc/libxml2/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/textproc/libxml2/pkg-plist
===================================================================
--- trunk/textproc/libxml2/pkg-plist	2014-03-17 01:48:11 UTC (rev 16065)
+++ trunk/textproc/libxml2/pkg-plist	2014-03-17 01:51:16 UTC (rev 16066)
@@ -55,5 +55,9 @@
 lib/libxml2.so.5
 libdata/pkgconfig/libxml-2.0.pc
 share/aclocal/libxml.m4
+man/man1/xml2-config.1.gz
+man/man1/xmlcatalog.1.gz
+man/man1/xmllint.1.gz
+man/man3/libxml.3.gz
 @dirrm include/libxml2/libxml
 @dirrm include/libxml2

More information about the Midnightbsd-cvs mailing list