[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: LinCVS port

To: ports@openbsd.org
Subject: Re: LinCVS port
From: rich cannings <rich@cannings.org>
Date: Wed, 25 Feb 2004 10:05:44 -0700
Cc: David Moreno Garza <damog@damog.net>, espie@nerim.net,reinhard@openbsd.org
References: <20040203165949.7156ed59.damog@damog.net> <20040203233549.GB27202@tetto.gentiane.org> <20040203174223.53c2bc38.damog@damog.net> <403CD473.9040504@cannings.org>
User-Agent: Mozilla/5.0 (X11; U; OpenBSD i386; en-US; rv:1.6) Gecko/20040224

watch out for the CVS/Root part of the patch. Here's the patch 
with that part removed.


rich cannings wrote:
> Attached is a diff to update LinCVS from 0.4.90 to 1.3.0.
> 
> LinCVS now uses qmake and has a terrible install script. So my Makefile 
> is a bit of a hack. Tell me if this port is too much of a hack. 
> Otherwise enjoy.
> 
> Comments are always appreciated.
> 
> David Moreno Garza wrote:
> 
>> On Wed, 4 Feb 2004 00:35:49 +0100
>> Marc Espie <espie@nerim.net> wrote:
>>
>>
>>> On Tue, Feb 03, 2004 at 04:59:49PM -0600, David Moreno Garza wrote:
>>>
>>>> Is there any effort for bringing LinCVS 1.3.0 (or even > 1.0) to an
>>>> OpenBSD port?
>>>>
>>>> The port on -current is quite old (0.4.90).
>>>
>>>
>>> Haven't tried, would make sense, especially as it's one of the few
>>> ports that doesn't build with gcc3.
>>>
>>> Volunteers ?
>>
>>
>>
>> That's way I asked for any effort. I'll try it. Keep in tune :-)
>>
> 
> ------------------------------------------------------------------------
> 
> diff lincvs.orig/CVS/Root lincvs/CVS/Root
> --- lincvs.orig/CVS/Root	Wed Feb 25 09:55:57 2004
> +++ lincvs/CVS/Root	Wed Feb 25 09:56:07 2004
> @@ -1 +1 @@
> -:ext:anoncvs@anoncvs.ca.openbsd.org:/cvs
> +/cvs
> diff lincvs.orig/Makefile lincvs/Makefile
> --- lincvs.orig/Makefile	Wed Feb 25 09:55:57 2004
> +++ lincvs/Makefile	Wed Feb 25 09:56:07 2004
> @@ -1,11 +1,9 @@
>  # $OpenBSD: Makefile,v 1.12 2003/12/03 20:18:36 sturm Exp $
>  
> -COMMENT=	"graphical CVS front-end using QT2"
> +COMMENT=	"graphical CVS front-end using QT3"
>  
> -# pthread
> -NOT_FOR_ARCHS=	sparc
> -
> -DISTNAME=	lincvs-0.4.90
> +VERSION=	1.3.0
> +DISTNAME=	lincvs-${VERSION}
>  CATEGORIES=	devel
>  
>  HOMEPAGE=	http://www.lincvs.org
> @@ -18,22 +16,51 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	http://lincvs.sunsite.dk/download/${DISTNAME}/
> +MASTER_SITES=	http://ppprs1.phy.tu-dresden.de/~trogisch/lincvs/download/20_LinCVS/hp_${DISTNAME}/
>  EXTRACT_SUFX=	-0-generic-src.tgz
>  
>  USE_GMAKE=	Yes
>  USE_X11=	Yes
>  
> -MODULES=	qt2 gcc3
> -MODGCC3_ARCHES=	sparc64
> -MODGCC3_LANGS=	c++
> +MODQT_MT=	Yes
> +MODULES=	qt3
> +QTDIR=		${LOCALBASE}
>  
> -BUILD_DEPENDS=	::x11/qt2-designer
> +# For some reason, uic3-mt wants to write to $HOME.
> +MAKE_FLAGS=	HOME=${WRKBUILD}
>  
> -CONFIGURE_STYLE=gnu
> -CONFIGURE_ARGS=	${MODQT_CONFIGURE_ARGS} \
> -		--datadir=${LOCALBASE}/share/doc
> -CONFIGURE_ENV=	LDFLAGS="-L${MODQT_LIBDIR} -L${LOCALBASE}/lib"
> -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/auxdir
> +HELP_FILES= AUTHORS \
> +BUGS.txt \
> +ChangeLog \
> +COPYING \
> +doc/FAM-HOWTO.txt \
> +doc/FAQ.txt \
> +doc/INFO.txt \
> +doc/INSTALL \
> +doc/INSTALL.html \
> +LICENSE \
> +NEWS \
> +doc/PROXY-HOWTO.txt \
> +doc/README \
> +doc/README.html \
> +doc/SSH-HOWTO.txt \
> +THANKS \
> +VERSION
> +
> +do-configure:
> +	@cd ${WRKBUILD} && ${QTDIR}/bin/qmake-mt \
> +		-spec ${PREFIX}/lib/qt3/mkspecs/openbsd-g++ lincvs.pro
> +
> +do-install:
> +	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS
> +	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS/Help
> +.for files in ${HELP_FILES}
> +	${INSTALL_DATA} ${WRKBUILD}/${files} ${PREFIX}/share/LinCVS/Help
> +.endfor
> +	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS/Messages
> +	${INSTALL_DATA} ${WRKBUILD}/ts/* ${PREFIX}/share/LinCVS/Messages
> +	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS/tools
> +	${INSTALL_DATA} ${WRKBUILD}/tools/* ${PREFIX}/share/LinCVS/tools
> +	${INSTALL_PROGRAM} ${WRKBUILD}/lincvs.bin ${PREFIX}/bin
>  
>  .include <bsd.port.mk>
> diff lincvs.orig/distinfo lincvs/distinfo
> --- lincvs.orig/distinfo	Wed Feb 25 09:55:57 2004
> +++ lincvs/distinfo	Wed Feb 25 09:56:07 2004
> @@ -1,3 +1,3 @@
> -MD5 (lincvs-0.4.90-0-generic-src.tgz) = 08d6eb8d4443e9b1fc470e93f9263827
> -RMD160 (lincvs-0.4.90-0-generic-src.tgz) = c3623b60e4c3b2f7b3618b6c3cec154bb263c5cb
> -SHA1 (lincvs-0.4.90-0-generic-src.tgz) = ec62dbdb5bf2569cbafaa020d89387c2871624da
> +MD5 (lincvs-1.3.0-0-generic-src.tgz) = 8272c7761a1d1439c8268f3e9e75bda1
> +RMD160 (lincvs-1.3.0-0-generic-src.tgz) = 0f2d9475603cbd594193fbf9451b27e7881ff174
> +SHA1 (lincvs-1.3.0-0-generic-src.tgz) = 51fe6dbdde2f8abcb065cc010a6a96ac31f274d9
> Only in lincvs: patches
> diff lincvs.orig/pkg/CVS/Root lincvs/pkg/CVS/Root
> --- lincvs.orig/pkg/CVS/Root	Wed Feb 25 09:55:57 2004
> +++ lincvs/pkg/CVS/Root	Wed Feb 25 09:56:07 2004
> @@ -1 +1 @@
> -:ext:anoncvs@anoncvs.ca.openbsd.org:/cvs
> +/cvs
> diff lincvs.orig/pkg/PLIST lincvs/pkg/PLIST
> --- lincvs.orig/pkg/PLIST	Wed Feb 25 09:55:57 2004
> +++ lincvs/pkg/PLIST	Wed Feb 25 09:56:07 2004
> @@ -1,15 +1,39 @@
> -@comment $OpenBSD: PLIST,v 1.3 2001/12/09 11:00:22 reinhard Exp $
> -bin/LinCVS
> -bin/set-ssh-commit-env.sh
> -bin/set-ssh-env.sh
> -bin/start-openssh-agent.sh
> -bin/start-ssh-agent.sh
> -share/doc/lincvs/AUTHORS
> -share/doc/lincvs/COPYING
> -share/doc/lincvs/ChangeLog
> -share/doc/lincvs/INSTALL
> -share/doc/lincvs/README
> -share/doc/lincvs/SSH.txt
> -share/doc/lincvs/THANKS
> -share/doc/lincvs/VERSION
> -@dirrm share/doc/lincvs
> +@comment $OpenBSD$
> +bin/lincvs.bin
> +share/LinCVS/Help/AUTHORS
> +share/LinCVS/Help/BUGS.txt
> +share/LinCVS/Help/COPYING
> +share/LinCVS/Help/ChangeLog
> +share/LinCVS/Help/FAM-HOWTO.txt
> +share/LinCVS/Help/FAQ.txt
> +share/LinCVS/Help/INFO.txt
> +share/LinCVS/Help/INSTALL
> +share/LinCVS/Help/INSTALL.html
> +share/LinCVS/Help/LICENSE
> +share/LinCVS/Help/NEWS
> +share/LinCVS/Help/PROXY-HOWTO.txt
> +share/LinCVS/Help/README
> +share/LinCVS/Help/README.html
> +share/LinCVS/Help/SSH-HOWTO.txt
> +share/LinCVS/Help/THANKS
> +share/LinCVS/Help/VERSION
> +share/LinCVS/Messages/ca_ES.qm
> +share/LinCVS/Messages/ca_ES.ts
> +share/LinCVS/Messages/de.qm
> +share/LinCVS/Messages/de.ts
> +share/LinCVS/Messages/fr.qm
> +share/LinCVS/Messages/fr.ts
> +share/LinCVS/Messages/it.qm
> +share/LinCVS/Messages/it.ts
> +share/LinCVS/Messages/ja.qm
> +share/LinCVS/Messages/ja.ts
> +share/LinCVS/Messages/ru.qm
> +share/LinCVS/Messages/ru.ts
> +share/LinCVS/tools/launch_emacs.sh
> +share/LinCVS/tools/launch_xemacs.sh
> +share/LinCVS/tools/start-ssh-agent.sh
> +share/LinCVS/tools/start-ssh.sh
> +@dirrm share/LinCVS/tools
> +@dirrm share/LinCVS/Messages
> +@dirrm share/LinCVS/Help
> +@dirrm share/LinCVS

diff lincvs.orig/Makefile lincvs/Makefile
--- lincvs.orig/Makefile	Wed Feb 25 09:55:57 2004
+++ lincvs/Makefile	Wed Feb 25 09:56:07 2004
@@ -1,11 +1,9 @@
 # $OpenBSD: Makefile,v 1.12 2003/12/03 20:18:36 sturm Exp $
 
-COMMENT=	"graphical CVS front-end using QT2"
+COMMENT=	"graphical CVS front-end using QT3"
 
-# pthread
-NOT_FOR_ARCHS=	sparc
-
-DISTNAME=	lincvs-0.4.90
+VERSION=	1.3.0
+DISTNAME=	lincvs-${VERSION}
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.lincvs.org
@@ -18,22 +16,51 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://lincvs.sunsite.dk/download/${DISTNAME}/
+MASTER_SITES=	http://ppprs1.phy.tu-dresden.de/~trogisch/lincvs/download/20_LinCVS/hp_${DISTNAME}/
 EXTRACT_SUFX=	-0-generic-src.tgz
 
 USE_GMAKE=	Yes
 USE_X11=	Yes
 
-MODULES=	qt2 gcc3
-MODGCC3_ARCHES=	sparc64
-MODGCC3_LANGS=	c++
+MODQT_MT=	Yes
+MODULES=	qt3
+QTDIR=		${LOCALBASE}
 
-BUILD_DEPENDS=	::x11/qt2-designer
+# For some reason, uic3-mt wants to write to $HOME.
+MAKE_FLAGS=	HOME=${WRKBUILD}
 
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${MODQT_CONFIGURE_ARGS} \
-		--datadir=${LOCALBASE}/share/doc
-CONFIGURE_ENV=	LDFLAGS="-L${MODQT_LIBDIR} -L${LOCALBASE}/lib"
-MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/auxdir
+HELP_FILES= AUTHORS \
+BUGS.txt \
+ChangeLog \
+COPYING \
+doc/FAM-HOWTO.txt \
+doc/FAQ.txt \
+doc/INFO.txt \
+doc/INSTALL \
+doc/INSTALL.html \
+LICENSE \
+NEWS \
+doc/PROXY-HOWTO.txt \
+doc/README \
+doc/README.html \
+doc/SSH-HOWTO.txt \
+THANKS \
+VERSION
+
+do-configure:
+	@cd ${WRKBUILD} && ${QTDIR}/bin/qmake-mt \
+		-spec ${PREFIX}/lib/qt3/mkspecs/openbsd-g++ lincvs.pro
+
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS
+	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS/Help
+.for files in ${HELP_FILES}
+	${INSTALL_DATA} ${WRKBUILD}/${files} ${PREFIX}/share/LinCVS/Help
+.endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS/Messages
+	${INSTALL_DATA} ${WRKBUILD}/ts/* ${PREFIX}/share/LinCVS/Messages
+	${INSTALL_DATA_DIR} ${PREFIX}/share/LinCVS/tools
+	${INSTALL_DATA} ${WRKBUILD}/tools/* ${PREFIX}/share/LinCVS/tools
+	${INSTALL_PROGRAM} ${WRKBUILD}/lincvs.bin ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff lincvs.orig/distinfo lincvs/distinfo
--- lincvs.orig/distinfo	Wed Feb 25 09:55:57 2004
+++ lincvs/distinfo	Wed Feb 25 09:56:07 2004
@@ -1,3 +1,3 @@
-MD5 (lincvs-0.4.90-0-generic-src.tgz) = 08d6eb8d4443e9b1fc470e93f9263827
-RMD160 (lincvs-0.4.90-0-generic-src.tgz) = c3623b60e4c3b2f7b3618b6c3cec154bb263c5cb
-SHA1 (lincvs-0.4.90-0-generic-src.tgz) = ec62dbdb5bf2569cbafaa020d89387c2871624da
+MD5 (lincvs-1.3.0-0-generic-src.tgz) = 8272c7761a1d1439c8268f3e9e75bda1
+RMD160 (lincvs-1.3.0-0-generic-src.tgz) = 0f2d9475603cbd594193fbf9451b27e7881ff174
+SHA1 (lincvs-1.3.0-0-generic-src.tgz) = 51fe6dbdde2f8abcb065cc010a6a96ac31f274d9
Only in lincvs: patches
diff lincvs.orig/pkg/CVS/Root lincvs/pkg/CVS/Root
--- lincvs.orig/pkg/CVS/Root	Wed Feb 25 09:55:57 2004
+++ lincvs/pkg/CVS/Root	Wed Feb 25 09:56:07 2004
@@ -1 +1 @@
-:ext:anoncvs@anoncvs.ca.openbsd.org:/cvs
+/cvs
diff lincvs.orig/pkg/PLIST lincvs/pkg/PLIST
--- lincvs.orig/pkg/PLIST	Wed Feb 25 09:55:57 2004
+++ lincvs/pkg/PLIST	Wed Feb 25 09:56:07 2004
@@ -1,15 +1,39 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/12/09 11:00:22 reinhard Exp $
-bin/LinCVS
-bin/set-ssh-commit-env.sh
-bin/set-ssh-env.sh
-bin/start-openssh-agent.sh
-bin/start-ssh-agent.sh
-share/doc/lincvs/AUTHORS
-share/doc/lincvs/COPYING
-share/doc/lincvs/ChangeLog
-share/doc/lincvs/INSTALL
-share/doc/lincvs/README
-share/doc/lincvs/SSH.txt
-share/doc/lincvs/THANKS
-share/doc/lincvs/VERSION
-@dirrm share/doc/lincvs
+@comment $OpenBSD$
+bin/lincvs.bin
+share/LinCVS/Help/AUTHORS
+share/LinCVS/Help/BUGS.txt
+share/LinCVS/Help/COPYING
+share/LinCVS/Help/ChangeLog
+share/LinCVS/Help/FAM-HOWTO.txt
+share/LinCVS/Help/FAQ.txt
+share/LinCVS/Help/INFO.txt
+share/LinCVS/Help/INSTALL
+share/LinCVS/Help/INSTALL.html
+share/LinCVS/Help/LICENSE
+share/LinCVS/Help/NEWS
+share/LinCVS/Help/PROXY-HOWTO.txt
+share/LinCVS/Help/README
+share/LinCVS/Help/README.html
+share/LinCVS/Help/SSH-HOWTO.txt
+share/LinCVS/Help/THANKS
+share/LinCVS/Help/VERSION
+share/LinCVS/Messages/ca_ES.qm
+share/LinCVS/Messages/ca_ES.ts
+share/LinCVS/Messages/de.qm
+share/LinCVS/Messages/de.ts
+share/LinCVS/Messages/fr.qm
+share/LinCVS/Messages/fr.ts
+share/LinCVS/Messages/it.qm
+share/LinCVS/Messages/it.ts
+share/LinCVS/Messages/ja.qm
+share/LinCVS/Messages/ja.ts
+share/LinCVS/Messages/ru.qm
+share/LinCVS/Messages/ru.ts
+share/LinCVS/tools/launch_emacs.sh
+share/LinCVS/tools/launch_xemacs.sh
+share/LinCVS/tools/start-ssh-agent.sh
+share/LinCVS/tools/start-ssh.sh
+@dirrm share/LinCVS/tools
+@dirrm share/LinCVS/Messages
+@dirrm share/LinCVS/Help
+@dirrm share/LinCVS

References:
- LinCVS port
  - From: David Moreno Garza <damog@damog.net>
- Re: LinCVS port
  - From: Marc Espie <espie@nerim.net>
- Re: LinCVS port
  - From: David Moreno Garza <damog@damog.net>
- Re: LinCVS port
  - From: rich cannings <rich@cannings.org>

Prev by Date: when is the big lock-owski?
Next by Date: UPDATE: net/zebra
Prev by thread: Re: LinCVS port
Next by thread: NEW: auctex
Index(es):
- Date
- Thread