Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Jan 2002 15:14:03 -0300
From:      Fernan Aguero <fernan@iib.unsam.edu.ar>
To:        gnats-admin@FreeBSD.org, freebsd-ports@FreeBSD.org
Subject:   Re: ports/34000: New Port: kaptain
Message-ID:  <20020121151403.F57848@iib.unsam.edu.ar>
In-Reply-To: <200201171810.g0HIA0a40409@freefall.freebsd.org>; from gnats-admin@FreeBSD.org on Thu, Jan 17, 2002 at 10:10:00AM -0800
References:  <200201171759.g0HHxr629871@pi.iib.unsam.edu.ar> <200201171810.g0HIA0a40409@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

This is an update to the original version of the port, which I think
it is still traked down as 'open'.

http://www.freebsd.org/cgi/query-pr.cgi?pr=34000

I have changed the behaviour of the port to build without KDE2 by
default. Those who'd like kaptain with KDE libs should say
WITH_KDE=yes at make time.

There are some fixes (patches -ag and -ah) for the case of building
without KDE, thanks to Brad Chapman from freebsd-bio. This was
untested in the original submission of the port.

New/modified files:
	Makefile				modified
	pkg-descr				modified
	pkg-comment			modified
	files/patch-ag	new
	files/patch-ah	new
	
I am including in this message the new files and diffs for the
modified files. 

Fernan

 

--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.diff"

--- Makefile.orig	Mon Jan 21 15:09:56 2002
+++ Makefile	Mon Jan 21 15:07:30 2002
@@ -1,5 +1,5 @@
 # New ports collection makefile for:   kaptain-0.6
-# Date created:        17 January 2002
+# Date created:        21 January 2002
 # Whom:                Fernan Aguero <fernan@iib.unsam.edu.ar>
 #
 # $FreeBSD$
@@ -9,6 +9,7 @@
 
 PORTNAME=       	kaptain
 PORTVERSION=    	0.6
+PORTREVISION=		1
 CATEGORIES=     	x11
 MASTER_SITES=   	${MASTER_SITE_SOURCEFORGE} \
 			http://download.sourceforge.net/
@@ -20,6 +21,16 @@
 USE_GMAKE=      	yes
 GNU_CONFIGURE=  	yes
 USE_QT_VER=     	2
+
+.if !defined(WITH_KDE)
+WITH_KDE=		no
+.endif
+
+.if ${WITH_KDE:L} == yes
+USE_KDELIBS_VER=	2
+.else
+CONFIGURE_ARGS+=	--disable-kde
+.endif
 
 post-patch:
 	$(PERL) -pi -e 's@qt@qt2@g' $(WRKSRC)/configure

--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pkg-comment.diff"

--- pkg-comment.orig	Mon Jan 21 15:10:20 2002
+++ pkg-comment	Mon Jan 21 15:03:08 2002
@@ -1 +1 @@
-Kaptain is a universal graphical front-end for command line programs
+Kaptain, a universal graphical front-end for command line programs

--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pkg-descr.diff"

--- pkg-descr.orig	Mon Jan 21 15:10:08 2002
+++ pkg-descr	Mon Jan 21 15:06:47 2002
@@ -7,9 +7,10 @@
 As of v0.6 Kaptain has no manpages. You should refer to the
 documentation in HTML format under PREFIX/share/doc/kaptain.
 
-Although it expects KDE2, you can build it with --disable-kde. It will
-still need the QT2 libraries, though. [currently untested! email the
-maintainer - currently ports@freebsd.org - if you have problems]
+Kaptain needs QT2 libraries and [optionally] KDE2 libraries.
+The default behaviour is to build with QT libs only. 
+Pass WITH_KDE=yes to make if you'd like kaptain to look like any other
+KDE app. 
 
 Grammars for some popular command-line utilities are installed with
 the port under PREFIX/share/kaptain/grammars.

--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ag

*** captain/qregvalidator.h.orig	Sun Mar 25 07:54:58 2001
--- captain/qregvalidator.h	Mon Jan 21 10:57:03 2002
***************
*** 23,29 ****
  #endif
  
  #include <qvalidator.h>
! #include "regex.h"
  
  class QString;
  
--- 23,29 ----
  #endif
  
  #include <qvalidator.h>
! #include "gnuregex.h"
  
  class QString;
  

--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ah

*** captain/Makefile.in.orig	Sat Mar 31 05:32:01 2001
--- captain/Makefile.in	Mon Jan 21 11:20:05 2002
***************
*** 196,202 ****
  kaptain_SOURCES = kaptainwizard.cpp kexecutor.cpp qregvalidator.cpp      kplace.cpp kgrammar.cpp krule.cpp parser.yy lexer.ll      kaptain.cpp main.cpp kmyprocess.cpp kmyprocctrl.cpp
  
  
! kaptain_LDADD = -lqt -lXext -lX11 $(LIBSOCKET)
  
  EXTRA_DIST = main.cpp kaptain.cpp kaptain.h  lexer.ll parser.yy      krule.cpp krule.h kgrammar.cpp kgrammar.h parser.h kplace.cpp kplace.h      qregvalidator.cpp qregvalidator.h kexecutor.cpp kexecutor.h      kaptainwizard.cpp kaptainwizard.h      kmyprocess.cpp kmyprocess.h      kmyprocctrl.cpp kmyprocctrl.h
  
--- 196,202 ----
  kaptain_SOURCES = kaptainwizard.cpp kexecutor.cpp qregvalidator.cpp      kplace.cpp kgrammar.cpp krule.cpp parser.yy lexer.ll      kaptain.cpp main.cpp kmyprocess.cpp kmyprocctrl.cpp
  
  
! kaptain_LDADD = -lqt2 -lXext -lX11 $(LIBSOCKET)
  
  EXTRA_DIST = main.cpp kaptain.cpp kaptain.h  lexer.ll parser.yy      krule.cpp krule.h kgrammar.cpp kgrammar.h parser.h kplace.cpp kplace.h      qregvalidator.cpp qregvalidator.h kexecutor.cpp kexecutor.h      kaptainwizard.cpp kaptainwizard.h      kmyprocess.cpp kmyprocess.h      kmyprocctrl.cpp kmyprocctrl.h
  

--u3/rZRmxL6MmkK24--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020121151403.F57848>