Re: CVS commit: pkgsrc

[Thomas Klausner <wiz%netbsd.org@localhost>]

On Sun, Apr 15, 2012 at 10:23:17PM +0000, David Holland wrote:
> On Sun, Apr 15, 2012 at 10:07:37PM +0000, Thomas Klausner wrote:
>  > Modified Files:
>  >      [...]
>  >    pkgsrc/textproc/libclucene: Makefile Makefile
>  > [...]
>  > cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/libclucene/Makefile
>  > cvs rdiff -u -r1.3 -r1.5 pkgsrc/textproc/libclucene/Makefile
> 
> How did you manage that? :-)
> 
> (It doesn't appear to be wrong/broken; but log_accum shouldn't do this...)

I have no idea what happened here.

I'm a bit worried because of the intermediate diffs:

# cvs di -r1.3 -r1.4 Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libclucene/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile    23 Jul 2009 08:59:54 -0000      1.3
+++ Makefile    15 Apr 2012 22:07:36 -0000      1.4
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.3 2009/07/23 08:59:54 markd Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/15 22:07:36 wiz Exp $

-DISTNAME=              clucene-core-0.9.21b
+DISTNAME=              clucene-core-2.3.3.4
 PKGNAME=               lib${DISTNAME:S/-core-/-/}
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=clucene/}

-MAINTAINER=            mkirby%NetBSD.org@localhost
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://clucene.sourceforge.net/index.php/Main_Page
 COMMENT=               Text search engine written in C++
 LICENSE=               gnu-lgpl-v2.1 OR apache-2.0

 PKG_DESTDIR_SUPPORT=   user-destdir

-USE_TOOLS+=            gmake
+PKGCONFIG_OVERRIDE+=   libclucene-core.pc.in
+
 USE_LANGUAGES=         c c++
-GNU_CONFIGURE=         yes
+USE_CMAKE=             yes
 USE_LIBTOOL=           yes

+.include "../../devel/boost-libs/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

# cvs di -r1.4 -r1.5 Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libclucene/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile    15 Apr 2012 22:07:36 -0000      1.4
+++ Makefile    15 Apr 2012 22:07:37 -0000      1.5
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2012/04/15 22:07:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/15 22:07:37 wiz Exp $

-DISTNAME=              clucene-core-2.3.3.4
+DISTNAME=              clucene-core-0.9.21b
 PKGNAME=               lib${DISTNAME:S/-core-/-/}
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=clucene/}
@@ -12,12 +12,9 @@

 PKG_DESTDIR_SUPPORT=   user-destdir

-PKGCONFIG_OVERRIDE+=   libclucene-core.pc.in
-
+USE_TOOLS+=            gmake
 USE_LANGUAGES=         c c++
-USE_CMAKE=             yes
+GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes

-.include "../../devel/boost-libs/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"


though the final diff looks ok:

# cvs di -r1.3 -r1.5 Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libclucene/Makefile,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -r1.3 -r1.5
--- Makefile    23 Jul 2009 08:59:54 -0000      1.3
+++ Makefile    15 Apr 2012 22:07:37 -0000      1.5
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2009/07/23 08:59:54 markd Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/15 22:07:37 wiz Exp $

 DISTNAME=              clucene-core-0.9.21b
 PKGNAME=               lib${DISTNAME:S/-core-/-/}
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=clucene/}

-MAINTAINER=            mkirby%NetBSD.org@localhost
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://clucene.sourceforge.net/index.php/Main_Page
 COMMENT=               Text search engine written in C++
 LICENSE=               gnu-lgpl-v2.1 OR apache-2.0


 Thomas