upgrade to kountdown 0.4.1.

x11/kountdown/Makefile

@@ -1,38 +1,38 @@
-# $OpenBSD: Makefile,v 1.5 2003/03/05 16:09:07 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2003/04/15 00:01:50 brad Exp $
-
-BROKEN=		"does not build with Qt 3.1"
 
 COMMENT=	"screen saver that displays a countdown to a selected date"
 
-DISTNAME=	kountdown-0.3.2
+DISTNAME=	kountdown-0.4.1
 CATEGORIES=	x11
 
-HOMEPAGE=	http://w1.911.telia.com/~u91117365/kountdown/kountdown.html
+HOMEPAGE=	http://www.lysator.liu.se/~erre/kountdown.html
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 
+# GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=	http://w1.911.telia.com/~u91117365/download/kountdown/
+MASTER_SITES=	http://www.lysator.liu.se/~erre/download/kountdown/
 
 LIB_DEPENDS=	kdecore.4,DCOP,kdefx,kdesu,kdeui,kio,kscreensaver::x11/kde/libs3
 
-MODULES=	qt3
+AUTOCONF_VERSION= 2.52
+MODKDE_VERSION= 3.1
+MODULES=	kde
 
-MAKE_ENV=	${CONFIGURE_ENV}
+PORTHOME=	${WRKDIR}
-MAKE_FLAGS=	CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
+
+MAKE_ENV=	KDEDIR="${LOCALBASE}"
+MAKE_FLAGS=	${MODKDE_MAKE_FLAGS}
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
+MODGNU_CONFIG_GUESS_DIRS= ${MODKDE_CONFIG_GUESS_DIRS}
-CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}
-CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
+CONFIGURE_ENV=	${MODKDE_CONFIGURE_ENV}
-CONFIGURE_ARGS+= -disable-mt --disable-threading --enable-final
-CONFIGURE_ENV=	KDEDIR=${LOCALBASE} 
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/admin
 
 .include <bsd.port.mk>

x11/kountdown/distinfo

@@ -1,3 +1,3 @@
-MD5 (kountdown-0.3.2.tar.gz) = 05559036b2297e0a8f898046a17618fe
+MD5 (kountdown-0.4.1.tar.gz) = b2846b7942c82aad9ee0c8b6b29fb13b
-RMD160 (kountdown-0.3.2.tar.gz) = 364f765601a295241e06af81ef3cfc2a43c36877
+RMD160 (kountdown-0.4.1.tar.gz) = fc39d1e43d5a9d56313d6770e839c66f805f78c6
-SHA1 (kountdown-0.3.2.tar.gz) = 1924fb4848f19c94db4380d6dbd523dfaaa58ea2
+SHA1 (kountdown-0.4.1.tar.gz) = e949c6460415dd17ecdaae910abb72595ac407ef

x11/kountdown/patches/patch-configure_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure_in,v 1.1 2003/04/15 00:01:50 brad Exp $
+--- configure.in.orig	Mon Apr 14 19:41:24 2003
++++ configure.in	Mon Apr 14 19:41:35 2003
+@@ -68,8 +68,6 @@ dnl AC_PROG_YACC dnl __kdevelop__
+ 
+ KDE_CREATE_SUBDIRSLIST
+ AC_CONFIG_FILES([ Makefile ])
+-AC_CONFIG_FILES([ doc/Makefile ])
+-AC_CONFIG_FILES([ doc/en/Makefile ])
+ AC_CONFIG_FILES([ kountdown/Makefile ])
+ AC_CONFIG_FILES([ kountdown/setupdlg/Makefile ])
+ AC_CONFIG_FILES([ po/Makefile ])

x11/kountdown/patches/patch-kountdown_kdtimer_cpp

@@ -1,57 +0,0 @@
-$OpenBSD: patch-kountdown_kdtimer_cpp,v 1.1 2002/09/30 13:10:39 naddy Exp $
---- kountdown/kdtimer.cpp.orig	Mon Sep 30 15:09:27 2002
-+++ kountdown/kdtimer.cpp	Mon Sep 30 15:11:04 2002
-@@ -71,7 +71,7 @@ KDTimer::KDTimer( const QDateTime *fdate
- * Make sure the round off (fr and hr) is within boundaries (KD::DOWN (0) - KD::MATH (3) ) else set it to KD::DOWN
- * hf and hr are only checked if != 0
- **/
--void KDTimer::init( short int *ff, short int *fr, short int *hf = 0, short int *hr = 0 )
-+void KDTimer::init( short int *ff, short int *fr, short int *hf, short int *hr )
- {
- 	finishDate = new QDateTime();
- 	halfDate = new QDateTime();
-@@ -214,7 +214,7 @@ void KDTimer::years( short int r )
- 	}
- }
- 
--void KDTimer::months( short int r, const short int f = -1 )
-+void KDTimer::months( short int r, const short int f )
- {
- 	ULONG months = 0;
- 	// Check if we can call years() to calc years left
-@@ -322,7 +322,7 @@ void KDTimer::weeks( short int r )
- 	}	
- }
- 
--void KDTimer::days( short int r, const short int f = -1 )
-+void KDTimer::days( short int r, const short int f )
- {
- 	ULONG temp = calcDate->daysTo( finishDate->date() );
- 	if ( *calcTime > finishDate->time() )
-@@ -353,7 +353,7 @@ void KDTimer::days( short int r, const s
- 	}		
- }
- 
--void KDTimer::hours( short int r, const short int f = -1 )
-+void KDTimer::hours( short int r, const short int f )
- {
- 	if ( f >= 0 && f < KD::DAYS )
- 	{
-@@ -389,7 +389,7 @@ void KDTimer::hours( short int r, const 
- 	}		
- }
- 
--void KDTimer::mins( short int r, const short int f = -1 )
-+void KDTimer::mins( short int r, const short int f )
- {
- 	if ( f < 0 && f < KD::HOURS )
- 	{
-@@ -423,7 +423,7 @@ void KDTimer::mins( short int r, const s
- 	}			
- }
- 
--void KDTimer::secs( const short int f = -1 )
-+void KDTimer::secs( const short int f )
- {
- 	timeLeft.secs = calcDateTime->secsTo( *finishDate );
- 	if ( f != -2 )