On Thu, Oct 20, 2005 at 08:36:18PM +0200, Hubert Feyrer wrote:
> 
> I think there's no good reason that the OOo2 package has a different pkg 
> basename (openoffice2) than OOo1 (openoffice). Please change it, so they 
> just differ in  the version number (and the pkgsrc dir name), but not in 
> the pkg basename.
> 
> I.e.
> -PKGNAME=                openoffice2-bin-2.0.0
> +PKGNAME=                openoffice-bin-2.0.0
> 
> This leads to "make deinstall" work in the OOo2 pkgsrc dir, and in general 
> less ugliness.
> 
> Thanks!

Hm, I disagree.  Since OO2 is still in RC stage, and a source package is
not quite near yet, OO1 will probably still be around for a while, and I
would prefer to make the two completely parallel.  This is as easy as
renaming the five OO2 binaries to soffice2 and so on: 

Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/misc/openoffice2-bin/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	20 Oct 2005 14:05:39 -0000	1.4
+++ Makefile	21 Oct 2005 01:52:34 -0000
@@ -92,10 +92,10 @@
 	uniq ${WRKDIR}/PLIST.nouniq >${WRKDIR}/PLIST
 	${RM} -f ${PREFIX}/bin/soffice
 	${SED}  -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
-		< ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
-	${CHMOD} +x ${PREFIX}/bin/soffice
+		< ${FILESDIR}/soffice > ${PREFIX}/bin/soffice2
+	${CHMOD} +x ${PREFIX}/bin/soffice2
 .for i in scalc sdraw simpress swriter
-	${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i}
+	${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i}2
 .endfor
 
 .include "../../misc/rpm/buildlink3.mk"
Index: PLIST.proglinks
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/misc/openoffice2-bin/PLIST.proglinks,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST.proglinks
--- PLIST.proglinks	9 Oct 2005 13:39:53 -0000	1.1.1.1
+++ PLIST.proglinks	21 Oct 2005 01:52:34 -0000
@@ -1,6 +1,6 @@
 @comment $NetBSD: PLIST.proglinks,v 1.1.1.1 2005/10/09 13:39:53 mrauch Exp $
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/soffice
-bin/swriter
+bin/scalc2
+bin/sdraw2
+bin/simpress2
+bin/soffice2
+bin/swriter2

What do you think?  

	Geert