[Midnightbsd-cvs] mports [16511] U trunk/devel/talloc/files: Update talloc to 2.1.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 22 19:55:02 EDT 2014 

Revision: 16511
          http://svnweb.midnightbsd.org/mports/?rev=16511
Author:   laffer1
Date:     2014-08-22 19:55:01 -0400 (Fri, 22 Aug 2014)
Log Message:
-----------
Update talloc to 2.1.0

Modified Paths:
--------------
    trunk/devel/talloc/Makefile
    trunk/devel/talloc/distinfo
    trunk/devel/talloc/files/talloc.3

Property Changed:
----------------
    trunk/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py
    trunk/devel/talloc/files/patch-wscript
    trunk/devel/talloc/files/talloc.3

Modified: trunk/devel/talloc/Makefile
===================================================================
--- trunk/devel/talloc/Makefile	2014-08-22 23:51:10 UTC (rev 16510)
+++ trunk/devel/talloc/Makefile	2014-08-22 23:55:01 UTC (rev 16511)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=		talloc
-PORTVERSION=		2.0.8
+PORTVERSION=		2.1.0
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		devel
@@ -15,64 +15,72 @@
 
 CONFLICTS=		samba33-3.*
 
-USES=			pkgconfig
-USE_PYTHON_BUILD=	-2.7
+USES=			compiler pkgconfig
+USE_PYTHON_BUILD=	2
 USE_LDCONFIG=		yes
-HAS_CONFIGURE=		yes
 WAF_TOOL=		buildtools/bin/waf
-CONFIGURE_SCRIPT=	${WAF_TOOL} configure
 CONFIGURE_LOG=		bin/config.log
 
-MAKE_JOBS_SAFE=		yes
-
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--prefix=${FAKE_DESTDIR}${PREFIX} \
 			--mandir=${FAKE_DESTDIR}${MANPREFIX}/man \
-			--infodir=${FAKE_DESTDIR}${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}
+			--infodir=${FAKE_DESTDIR}${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
+			--without-gettext
+# Support staging
+DESTDIRNAME=		--destdir
 
-OPTIONS_DEFINE=		PYTHON
-OPTIONS_DEFAULT=	PYTHON
+OPTIONS_DEFINE=		MANPAGES
+MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .include <bsd.mport.options.mk>
 
-MAN3=			talloc.3
+.if defined(NO_PYTHON)
+CONFIGURE_ARGS+=	--disable-python
+.else
+USE_PYTHON_RUN=		yes
+PLIST_FILES+=		include/pytalloc.h \
+			lib/libpytalloc-util.so \
+			lib/libpytalloc-util.so.2 \
+			%%PYTHON_SITELIBDIR%%/talloc.so \
+			%%PKGCONFIGDIR%%/pytalloc-util.pc
+.endif
 
-PLIST_FILES=		include/talloc.h \
+.include <bsd.port.pre.mk>
+
+.if ! ${PORT_OPTIONS:MMANPAGES}
+CONFIGURE_ENV+=		XSLTPROC="true"
+.else
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+			xsltproc:${PORTSDIR}/textproc/libxslt
+.endif
+
+PLIST_FILES+=		include/talloc.h \
 			lib/libtalloc.so \
 			lib/libtalloc.so.2 \
 			%%PKGCONFIGDIR%%/talloc.pc
 
-CONFIGURE_ENV+=		XSLTPROC="/usr/bin/true"
+# No fancy color error messages
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS+=		-fno-color-diagnostics
+.endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
 CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS=		--jobs=${MAKE_JOBS_NUMBER}
+_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
 .endif
-.endif
 
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON_RUN=		yes
-PLIST_FILES+=		include/pytalloc.h \
-			lib/libpytalloc-util.so \
-			lib/libpytalloc-util.so.2 \
-			%%PYTHON_SITELIBDIR%%/talloc.so \
-			%%PKGCONFIGDIR%%/pytalloc-util.pc
-PLIST_DIRSTRY+=		%%PYTHON_SITELIBDIR%% \
-			%%PYTHON_LIBDIR%%
-.else
-CONFIGURE_ARGS+=	--disable-python
-.endif
+TALLOC_MAN3=		man/man3/talloc.3.gz
 
+PLIST_FILES+=		${TALLOC_MAN3}
+
+CONFIGURE_TARGET=	configure
 ALL_TARGET=		build
 INSTALL_TARGET=		install
 
-.include <bsd.port.pre.mk>
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-patch:
@@ -88,11 +96,30 @@
 				${FALSE}; \
 			fi
 
+do-configure:
+			@(cd ${CONFIGURE_WRKSRC} && \
+			    ${SET_LATE_CONFIGURE_ARGS} \
+				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
+					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+					LDFLAGS="${LDFLAGS}" \
+					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
+					INSTALL_DATA="${INSTALL_DATA}" \
+					INSTALL_LIB="${INSTALL_LIB}" \
+					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
+						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
+						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+						${FALSE}; \
+				fi)
+
 pre-build:
-.for man in ${MAN3}
-			@${MKDIR} ${BUILD_WRKSRC}/bin/default
-			@${INSTALL_MAN} ${FILESDIR}/${man} ${BUILD_WRKSRC}/bin/default
-.endfor
+.if ! ${PORT_OPTIONS:MMANPAGES}
+			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
+.	for man in ${TALLOC_MAN3}
+			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
+.	endfor
+.endif
 
 do-build:
 			@(cd ${BUILD_WRKSRC}; \
@@ -107,9 +134,4 @@
 do-install:
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-post-install:
-	${REINPLACE_CMD} -e 's|${FAKE_DESTDIR}||g' \
-		${FAKE_DESTDIR}${TRUE_PREFIX}/libdata/pkgconfig/talloc.pc \
-		${FAKE_DESTDIR}${TRUE_PREFIX}/libdata/pkgconfig/pytalloc-util.pc
-
 .include <bsd.port.post.mk>

Modified: trunk/devel/talloc/distinfo
===================================================================
--- trunk/devel/talloc/distinfo	2014-08-22 23:51:10 UTC (rev 16510)
+++ trunk/devel/talloc/distinfo	2014-08-22 23:55:01 UTC (rev 16511)
@@ -1,2 +1,2 @@
-SHA256 (talloc-2.0.8.tar.gz) = 1ec11e635e0318dbbb014db38ff96e8dba3ce5f614eeb7d993b4a5b71c016783
-SIZE (talloc-2.0.8.tar.gz) = 433489
+SHA256 (talloc-2.1.0.tar.gz) = 0701393882647f823503e3aa075bc67d75c194b376822377dae2d20f9130f08f
+SIZE (talloc-2.1.0.tar.gz) = 416097

Index: trunk/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py
===================================================================
--- trunk/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py	2014-08-22 23:51:10 UTC (rev 16510)
+++ trunk/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py	2014-08-22 23:55:01 UTC (rev 16511)

Property changes on: trunk/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/talloc/files/patch-wscript
===================================================================
--- trunk/devel/talloc/files/patch-wscript	2014-08-22 23:51:10 UTC (rev 16510)
+++ trunk/devel/talloc/files/patch-wscript	2014-08-22 23:55:01 UTC (rev 16511)

Property changes on: trunk/devel/talloc/files/patch-wscript
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/talloc/files/talloc.3
===================================================================
--- trunk/devel/talloc/files/talloc.3	2014-08-22 23:51:10 UTC (rev 16510)
+++ trunk/devel/talloc/files/talloc.3	2014-08-22 23:55:01 UTC (rev 16511)
@@ -1,14 +1,23 @@
 '\" t
 .\"     Title: talloc
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/06/2011
-.\"    Manual: [FIXME: manual]
-.\"    Source: [FIXME: source]
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/13/2014
+.\"    Manual: System Administration tools
+.\"    Source: Samba 4.0
 .\"  Language: English
 .\"
-.TH "TALLOC" "3" "10/06/2011" "[FIXME: source]" "[FIXME: manual]"
+.TH "TALLOC" "3" "03/13/2014" "Samba 4\&.0" "System Administration tools"
 .\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
@@ -95,7 +104,7 @@
 argument to talloc() can be NULL, in which case a new top level context is created\&.
 .SS "void *talloc_size(const void *ctx, size_t size);"
 .PP
-The function talloc_size() should be used when you don\'t have a convenient type to pass to talloc()\&. Unlike talloc(), it is not type safe (as it returns a void *), so you are on your own for type checking\&.
+The function talloc_size() should be used when you don\*(Aqt have a convenient type to pass to talloc()\&. Unlike talloc(), it is not type safe (as it returns a void *), so you are on your own for type checking\&.
 .SS "(typeof(ptr)) talloc_ptrtype(const void *ctx, ptr);"
 .PP
 The talloc_ptrtype() macro should be used when you have a pointer and want to allocate memory to point at with this pointer\&. When compiling with gcc >= 3 it is typesafe\&. Note this is a wrapper of talloc_size() and talloc_get_name() will return the current location in the source file\&. and not the type\&.
@@ -129,8 +138,8 @@
 .\}
 .nf
 	    ERROR: talloc_free with references at some_dir/source/foo\&.c:123
-  	  	reference at some_dir/source/other\&.c:325
-  	  	reference at some_dir/source/third\&.c:121
+		reference at some_dir/source/other\&.c:325
+		reference at some_dir/source/third\&.c:121
 	  
 .fi
 .if n \{\
@@ -177,8 +186,6 @@
 .\}
 you can talloc_free() the pointer itself\&. That will destroy the most recently established parent to the pointer and leave the pointer as a child of its current parent\&.
 .RE
-.sp
-.RE
 .PP
 For more control on which parent to remove, see
 \(lqtalloc_unlink()\(rq\&.
@@ -365,8 +372,8 @@
 .\}
 .nf
 	  WARNING: talloc_steal with references at some_dir/source/foo\&.c:123
-  	  	reference at some_dir/source/other\&.c:325
-  	  	reference at some_dir/source/third\&.c:121
+		reference at some_dir/source/other\&.c:325
+		reference at some_dir/source/third\&.c:121
 	  
 .fi
 .if n \{\
@@ -426,7 +433,7 @@
 .PP
 This enables calling of talloc_report(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report command line option\&.
 .PP
-For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\'t call this function first then passing NULL to talloc_report() or talloc_report_full() won\'t give you the full tree printout\&.
+For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\*(Aqt call this function first then passing NULL to talloc_report() or talloc_report_full() won\*(Aqt give you the full tree printout\&.
 .PP
 Here is a typical talloc report:
 .sp
@@ -434,7 +441,7 @@
 .RS 4
 .\}
 .nf
-talloc report on \'null_context\' (total 267 bytes in 15 blocks)
+talloc report on \*(Aqnull_context\*(Aq (total 267 bytes in 15 blocks)
 libcli/auth/spnego_parse\&.c:55  contains   31 bytes in   2 blocks
 libcli/auth/spnego_parse\&.c:55  contains   31 bytes in   2 blocks
 iconv(UTF8,CP850)              contains   42 bytes in   2 blocks
@@ -451,7 +458,7 @@
 .PP
 This enables calling of talloc_report_full(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report\-full command line option\&.
 .PP
-For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\'t call this function first then passing NULL to talloc_report() or talloc_report_full() won\'t give you the full tree printout\&.
+For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\*(Aqt call this function first then passing NULL to talloc_report() or talloc_report_full() won\*(Aqt give you the full tree printout\&.
 .PP
 Here is a typical full report:
 .sp
@@ -459,7 +466,7 @@
 .RS 4
 .\}
 .nf
-full talloc report on \'root\' (total 18 bytes in 8 blocks)
+full talloc report on \*(Aqroot\*(Aq (total 18 bytes in 8 blocks)
 p1               contains     18 bytes in   7 blocks (ref 0)
     r1               contains     13 bytes in   2 blocks (ref 0)
         reference to: p2
@@ -488,7 +495,7 @@
 .\}
 .SS "void *talloc_zero_size(const void *\fIctx\fR, size_t \fIsize\fR)"
 .PP
-The talloc_zero_size() function is useful when you don\'t have a known type\&.
+The talloc_zero_size() function is useful when you don\*(Aqt have a known type\&.
 .SS "void *talloc_memdup(const void *\fIctx\fR, const void *\fIp\fR, size_t size);"
 .PP
 The talloc_memdup() function is equivalent to:
@@ -619,7 +626,7 @@
 .SS "void *talloc_check_name(const void *ptr, const char *name);"
 .PP
 This function checks if a pointer has the specified
-\fIname\fR\&. If it does then the pointer is returned\&. It it doesn\'t then NULL is returned\&.
+\fIname\fR\&. If it does then the pointer is returned\&. It it doesn\*(Aqt then NULL is returned\&.
 .SS "(type *)talloc_get_type(const void *ptr, type);"
 .PP
 This macro allows you to do type checking on talloc pointers\&. It is particularly useful for void* private pointers\&. It is equivalent to this:
@@ -662,6 +669,9 @@
 .PP
 malloc(3), strndup(3), vasprintf(3), asprintf(3),
 \m[blue]\fB\%http://talloc.samba.org/\fR\m[]
+.SH "AUTHOR"
+.PP
+The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
 .SH "COPYRIGHT/LICENSE"
 .PP
 Copyright (C) Andrew Tridgell 2004


Property changes on: trunk/devel/talloc/files/talloc.3
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list