qt2 module.

--enable-final

x11/kde/toys2/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2001/08/21 10:59:38 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2001/08/27 12:48:43 espie Exp $
 
 COMMENT=	"some useless kde applications"
 
 CATEGORIES=		x11 x11/kde games
-NEED_VERSION=	1.402
+NEED_VERSION=		1.447
 VERSION=		2.2
 DISTNAME=		kdetoys-${VERSION}
 DIST_SUBDIR=		kde
@@ -12,13 +12,15 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${VERSION}/src/
 EXTRACT_SUFX=		.tar.bz2
 
+MODULES=	qt2
 LIB_DEPENDS=	kdecore.3.::x11/kde/libs2
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--with-qt-includes=${LOCALBASE}/include/X11/qt2
-CONFIGURE_ARGS+=	--with-qt-libraries=${LOCALBASE}/lib/qt2
+CONFIGURE_ARGS=		${MODQT_CONFIGURE_ARGS}
 CONFIGURE_ARGS+=	--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-extra-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--enable-final
 #CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared
 
 # Not yet, too much time to compile
@@ -26,12 +28,11 @@ CONFIGURE_ARGS+=	--with-extra-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 
 USE_GMAKE=		Yes
-CONFIGURE_ENV=		MOC=${LOCALBASE}/bin/moc2 \
-	RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
+CONFIGURE_ENV=		RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
 MAKE_ENV=		${CONFIGURE_ENV}
 
 # Ensure qt2 will always be at the front
-MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2'
+MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
 
 # GPL
 PERMIT_DISTFILES_CDROM=	Yes

x11/kde/toys2/patches/patch-admin_ltcf-cxx_sh

@@ -1,6 +1,6 @@
---- admin/ltcf-cxx.sh.orig	Sat Sep  9 18:59:52 2000
-+++ admin/ltcf-cxx.sh	Thu Oct 26 23:26:15 2000
-@@ -107,13 +107,13 @@ if { ac_try='${CC-c++} -E conftest.$ac_e
+--- admin/ltcf-cxx.sh.orig	Sat May 19 09:19:10 2001
++++ admin/ltcf-cxx.sh	Mon Aug 20 11:32:45 2001
+@@ -105,13 +105,13 @@ if { ac_try='${CC-c++} -E conftest.$ac_e
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -16,8 +16,8 @@
  
  else
    with_gcc=no
-@@ -339,6 +339,12 @@ case "$host_os" in
-       ld_shlibs=no
+@@ -419,6 +419,12 @@ case $host_os in
+       remove_lgcc=yes
      fi
      ;;
 +  openbsd*)
@@ -29,7 +29,7 @@
    osf3*)
      if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
        allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-@@ -549,7 +555,7 @@ case "$host_os" in
+@@ -629,7 +635,7 @@ case $host_os in
              # Commands to make compiler produce verbose output that lists
              # what "hidden" libraries, object files and flags are used when
              # linking a shared library.

x11/kde/toys2/patches/patch-admin_ltconfig

@@ -1,8 +1,8 @@
---- admin/ltconfig.orig	Fri Sep 22 13:10:22 2000
-+++ admin/ltconfig	Sun Nov 26 16:53:02 2000
-@@ -620,6 +620,12 @@ old_archive_cmds='$AR $AR_FLAGS $oldlib$
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
+--- admin/ltconfig.orig	Sat May 19 09:19:10 2001
++++ admin/ltconfig	Mon Aug 20 11:32:45 2001
+@@ -628,6 +628,12 @@ if test -n "$RANLIB"; then
+   old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ fi
  
 +case "$host_os" in
 +openbsd*)
@@ -13,7 +13,7 @@
  # Source the script associated with the $tagname tag configuration.
  if test -n "$tagname"; then
    . $ltmain
-@@ -1135,6 +1141,15 @@ openbsd*)
+@@ -1249,6 +1255,15 @@ openbsd*)
      need_lib_prefix=no
      need_version=no
    fi