Attachment 88679 Details for Bug 125506 – cppunit.diff

[patch] cppunit.diff

cppunit.diff (text/x-diff; charset=us-ascii), 5.26 KB, created by Wesley Shields on 2008-07-11 20:39:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wesley Shields

Created: 2008-07-11 20:39:30 UTC

Size: 5.26 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /u/ncvs/ports/devel/cppunit/Makefile,v
>retrieving revision 1.8
>diff -u -u -r1.8 Makefile
>--- Makefile	3 May 2008 16:18:02 -0000	1.8
>+++ Makefile	11 Jul 2008 18:35:29 -0000
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/devel/cppunit/Makefile,v 1.8 2008/05/03 16:18:02 leeym Exp $
> 
> PORTNAME=	cppunit
>-PORTVERSION=	1.12.0
>+PORTVERSION=	1.12.1
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -20,27 +20,28 @@
> .if defined(WITH_DOXYGEN)
> BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
> CONFIGURE_ARGS+=	--enable-doc --enable-doxygen --enable-html-docs
>-PORTDOCS=	*
> .else
> CONFIGURE_ARGS+=	--disable-doc --disable-doxygen
> .endif
> 
>-.if !defined(NOPORTDOCS)
>-PORTDOCS=	*
>-.endif
>-
> MAN1=		cppunit-config.1
> #MANCOMPRESSED=	no
> 
>+.if defined(NOPORTDOCS)
>+PLIST_SUB+=	PORTDOCS="@comment "
>+.else
>+PLIST_SUB+=	PORTDOCS=""
>+.endif
>+
> pre-everything::
>-.if !defined(WITH_DOXYGEN) && !defined(NOPORTDOCS)
>+.if !defined(WITH_DOXYGEN)
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} You could define WITH_DOXYGEN if you want HTML documentation
> 	@${ECHO_MSG}
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -Ee "s,^(pkgconfigdatadir).*,\1 = ${LOCALBASE}/libdata/pkgconfig," \
>+	@${REINPLACE_CMD} -Ee "s,^(pkgconfigdatadir).*,\1 = ${LOCALBASE}/libdata/pkgconfig," \
> 		${WRKSRC}/Makefile.in
> 
> post-install:
>@@ -49,7 +50,7 @@
> 	@${FIND} ${PREFIX}/include/cppunit -type d | ${SORT} -r | \
> 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>+	# ${DOCSDIR} is created by doc/Makefile already.
> 	${INSTALL_MAN} ${WRKSRC}/doc/FAQ ${DOCSDIR}
> 	${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
> 	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
>Index: distinfo
>===================================================================
>RCS file: /u/ncvs/ports/devel/cppunit/distinfo,v
>retrieving revision 1.6
>diff -u -u -r1.6 distinfo
>--- distinfo	3 May 2008 16:18:02 -0000	1.6
>+++ distinfo	11 Jul 2008 15:47:08 -0000
>@@ -1,3 +1,3 @@
>-MD5 (cppunit-1.12.0.tar.gz) = 7493718733ded49a96cf763c5d3eea7f
>-SHA256 (cppunit-1.12.0.tar.gz) = 98a5c38cbcad916aea4dbd8fb42a41bc16174e42426d949127292adf4af7fe1f
>-SIZE (cppunit-1.12.0.tar.gz) = 760409
>+MD5 (cppunit-1.12.1.tar.gz) = bd30e9cf5523cdfc019b94f5e1d7fd19
>+SHA256 (cppunit-1.12.1.tar.gz) = ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a
>+SIZE (cppunit-1.12.1.tar.gz) = 762803
>Index: pkg-plist
>===================================================================
>RCS file: /u/ncvs/ports/devel/cppunit/pkg-plist,v
>retrieving revision 1.6
>diff -u -u -r1.6 pkg-plist
>--- pkg-plist	3 May 2008 16:18:02 -0000	1.6
>+++ pkg-plist	11 Jul 2008 18:35:13 -0000
>@@ -1,9 +1,13 @@
> bin/DllPlugInTester
> bin/cppunit-config
> lib/libcppunit-1.12.so
>-lib/libcppunit-1.12.so.0
>+lib/libcppunit-1.12.so.1
> lib/libcppunit.a
> lib/libcppunit.la
> lib/libcppunit.so
> libdata/pkgconfig/cppunit.pc
> share/aclocal/cppunit.m4
>+%%PORTDOCS%%%%DOCSDIR%%/FAQ
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: files/patch-config::ltmain.sh
>===================================================================
>RCS file: /u/ncvs/ports/devel/cppunit/files/patch-config::ltmain.sh,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-config::ltmain.sh
>--- files/patch-config::ltmain.sh	14 Aug 2004 08:19:02 -0000	1.1
>+++ files/patch-config::ltmain.sh	11 Jul 2008 15:47:08 -0000
>@@ -1,6 +1,6 @@
>---- config/ltmain.sh.orig	Wed Jul  7 16:52:56 2004
>-+++ config/ltmain.sh	Wed Jul  7 16:53:13 2004
>-@@ -5425,10 +5425,12 @@
>+--- config/ltmain.sh.orig	2008-07-11 18:31:19.000000000 +0800
>++++ config/ltmain.sh	2008-07-11 18:32:49.000000000 +0800
>+@@ -6092,10 +6092,12 @@
>  	fi
>  
>  	# Install the pseudo-library for information purposes.
>Index: files/patch-doc::Makefile.in
>===================================================================
>RCS file: /u/ncvs/ports/devel/cppunit/files/patch-doc::Makefile.in,v
>retrieving revision 1.2
>diff -u -u -r1.2 patch-doc::Makefile.in
>--- files/patch-doc::Makefile.in	14 Aug 2004 08:19:02 -0000	1.2
>+++ files/patch-doc::Makefile.in	11 Jul 2008 17:11:26 -0000
>@@ -1,11 +1,27 @@
>---- doc/Makefile.in.orig	Wed Jul  7 16:33:12 2004
>-+++ doc/Makefile.in	Wed Jul  7 16:34:27 2004
>-@@ -161,7 +161,7 @@
>+--- doc/Makefile.in.orig	2008-02-20 00:59:51.000000000 -0500
>++++ doc/Makefile.in	2008-07-11 13:11:05.000000000 -0400
>+@@ -179,7 +179,7 @@
>  # and an extra copy or two in the install-data-hook.  
>  # However, the manpages do not appear to be tremendously useful, so
>  # let's not bother.
> -@DOC_TRUE@htmldir = $(pkgdatadir)/html
> +@DOC_TRUE@htmldir = $(prefix)/share/doc/cppunit
>- @DOC_TRUE@html_DATA = $(static_pages) html/index.html
>- subdir = doc
>- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+ htmldir = @htmldir@
>+ includedir = @includedir@
>+ infodir = @infodir@
>+@@ -248,6 +248,7 @@
>+ 	-rm -rf .libs _libs
>+ install-htmlDATA: $(html_DATA)
>+ 	@$(NORMAL_INSTALL)
>++.if !defined(NOPORTDOCS)
>+ 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
>+ 	@list='$(html_DATA)'; for p in $$list; do \
>+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+@@ -255,6 +256,7 @@
>+ 	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
>+ 	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
>+ 	done
>++.endif
>+ 
>+ uninstall-htmlDATA:
>+ 	@$(NORMAL_UNINSTALL)

Actions: View | Diff

Attachments on bug 125506: 88677 | 88678 | 88679 | 88680