Upgrade to Qt 3.2.1 / KDE 3.1.4. See x11/kde3/Makefile rev 1.64 for d…

…etails.

Mk/bsd.kde.mk

@@ -113,7 +113,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.1.3
+KDE_VERSION=		3.1.4
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
@@ -123,9 +123,9 @@ QTCGFLIBS?=
 # Qt 3.x common stuff
 QT_PREFIX?=		${X11BASE}
 MOC?=			${QT_PREFIX}/bin/moc
-#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt31
-BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt31
-RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt31
+#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt32
+BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
+RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
 QTCPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include \
 				-I${QT_PREFIX}/include -D_GETOPT_H
 QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \

Mk/bsd.kde4.mk

@@ -113,7 +113,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.1.3
+KDE_VERSION=		3.1.4
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
@@ -123,9 +123,9 @@ QTCGFLIBS?=
 # Qt 3.x common stuff
 QT_PREFIX?=		${X11BASE}
 MOC?=			${QT_PREFIX}/bin/moc
-#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt31
-BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt31
-RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt31
+#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt32
+BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
+RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
 QTCPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include \
 				-I${QT_PREFIX}/include -D_GETOPT_H
 QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \

arabic/kde3-i18n/distinfo

@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.3.tar.bz2) = a65a66992883a98c4ed4d288d2f9a4ac
+MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.4.tar.bz2) = cc244c6a7359be5cebd2f0b4df2bbcb0

arabic/kde4-l10n/distinfo

@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.3.tar.bz2) = a65a66992883a98c4ed4d288d2f9a4ac
+MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.4.tar.bz2) = cc244c6a7359be5cebd2f0b4df2bbcb0

archivers/ark/distinfo

@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.3.tar.bz2) = 21f3fa1d110a8cf8cb1a140745f90211
+MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627

audio/arts/Makefile

@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	arts
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	audio kde

audio/arts/distinfo

@@ -1 +1 @@
-MD5 (KDE/arts-1.1.3.tar.bz2) = f04eb6ef387d63741561ab6623696322
+MD5 (KDE/arts-1.1.4.tar.bz2) = aa4bef1e80cd3795e3fd832471e348e9

audio/arts/files/patch-configure

@@ -1,6 +1,6 @@
---- configure.orig	Thu Jan 30 14:50:09 2003
-+++ configure	Thu Jan 30 14:50:25 2003
-@@ -2807,7 +2807,7 @@
+--- configure.orig	Wed Aug 20 13:08:00 2003
++++ configure	Wed Aug 20 13:07:43 2003
+@@ -2906,7 +2906,7 @@
    fi
  else
    if test "$GCC" = yes; then
@@ -9,7 +9,7 @@
    else
      CFLAGS=
    fi
-@@ -3214,7 +3214,7 @@
+@@ -3454,7 +3454,7 @@
          CFLAGS="-g -O2 $CFLAGS"
        fi
      else
@@ -18,7 +18,7 @@
      fi
    fi
 
-@@ -3456,7 +3456,7 @@
+@@ -3694,7 +3694,7 @@
    fi
  else
    if test "$GXX" = yes; then
@@ -27,7 +27,7 @@
    else
      CXXFLAGS=
    fi
-@@ -3805,7 +3805,7 @@
+@@ -4051,7 +4051,7 @@
        if test "$CXX" = "KCC"; then
          CXXFLAGS="+K3 $CXXFLAGS"
        else
@@ -36,3 +36,12 @@
        fi
      fi
    fi
+@@ -26467,7 +26467,7 @@
+
+
+
+-for ac_func in socket snprintf vsnprintf seteuid setegid random strfmon stpcpy mkstemp setmntent gettimeofday
++for ac_func in socket snprintf vsnprintf seteuid setegid random strfmon stpcpy mkstemp setmntent gettimeofday vasprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5

audio/arts/files/patch-flow-gsl-gslglib.c

@@ -0,0 +1,22 @@
+--- flow/gsl/gslglib.c.orig	Wed May  7 13:50:15 2003
++++ flow/gsl/gslglib.c	Wed Aug 20 03:06:26 2003
+@@ -44,6 +44,10 @@
+ 		  va_list      args1)
+ {
+   gchar *buffer;
++#ifdef HAVE_VASPRINTF
++  if (vasprintf (&buffer, format, args1) < 0)
++    buffer = NULL;
++#else
+   va_list args2;
+
+   G_VA_COPY (args2, args1);
+@@ -52,7 +56,7 @@
+
+   vsprintf (buffer, format, args2);
+   va_end (args2);
+-
++#endif
+   return buffer;
+ }
+ gchar *

audio/arts/files/patch-mcop-debug.cc

@@ -0,0 +1,22 @@
+--- mcop/debug.cc.orig	Sun Jul 13 21:33:40 2003
++++ mcop/debug.cc	Wed Aug 20 03:06:26 2003
+@@ -785,6 +785,10 @@
+ arts_strdup_vprintf (const char *format, va_list args1)
+ {
+   gchar *buffer;
++#ifdef HAVE_VASPRINTF
++  if (vasprintf (&buffer, format, args1) < 0)
++    buffer = NULL;
++#else
+   va_list args2;
+
+   G_VA_COPY (args2, args1);
+@@ -793,7 +797,7 @@
+
+   vsprintf (buffer, format, args2);
+   va_end (args2);
+-
++#endif
+   return buffer;
+ }
+

chinese/kde3-i18n-zh_CN/distinfo

@@ -1,2 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.3.tar.bz2) = a4f0b3531a6264fd95e735604e79bed7
-
+MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.4.tar.bz2) = b00d9763e16600de13360c8e0960eb30

chinese/kde3-i18n-zh_TW/distinfo

@@ -1,2 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.3.tar.bz2) = e964dadf856cc5845b6fdc9d8988b485
-
+MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.4.tar.bz2) = 89d6525644f5a5f2a743c395288502cf

chinese/kde4-l10n-zh_CN/distinfo

@@ -1,2 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.3.tar.bz2) = a4f0b3531a6264fd95e735604e79bed7
-
+MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.1.4.tar.bz2) = b00d9763e16600de13360c8e0960eb30

chinese/kde4-l10n-zh_TW/distinfo

@@ -1,2 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.3.tar.bz2) = e964dadf856cc5845b6fdc9d8988b485
-
+MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.1.4.tar.bz2) = 89d6525644f5a5f2a743c395288502cf

comms/kremotecontrol/distinfo

@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.3.tar.bz2) = 21f3fa1d110a8cf8cb1a140745f90211
+MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627

deskutils/kcharselect/distinfo

@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.3.tar.bz2) = 21f3fa1d110a8cf8cb1a140745f90211
+MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627

deskutils/kdepim3/Makefile

@@ -15,6 +15,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	[email protected]
 COMMENT=	Personal Information Management tools for KDE
 
+LIB_DEPENDS=	pisock:${PORTSDIR}/palm/pilot-link
+
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
@@ -23,7 +25,6 @@ USE_BISON=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-KDE_BUILD_PLIST=yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
@@ -32,25 +33,6 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include <bsd.port.pre.mk>
 
 pre-configure::
-	${REINPLACE_CMD} -e "s@-pedantic @@g; \
-	s@/usr/local/include/libmal@${LOCALBASE}/include/libmal@g" \
-	${WRKSRC}/configure
-
-.if exists(${LOCALBASE}/bin/pilot-xfer)
-WITH_KPILOT=YES
-.endif # exists(${LOCALBASE}/bin/pilot-xfer)
-
-.if defined(WITH_KPILOT)
-LIB_DEPENDS+=	pisock:${PORTSDIR}/palm/pilot-link \
-		mal:${PORTSDIR}/palm/libmal
-PLIST_APPEND+=	plist.kpilot
-.else
-	@${ECHO_MSG}
-	@${ECHO_MSG} "====================================================="
-	@${ECHO_MSG} "If you want to compile with Palm Pilot support, hit"
-	@${ECHO_MSG} "Ctrl-C right now and use \"make WITH_KPILOT=yes\""
-	@${ECHO_MSG} "====================================================="
-	@${ECHO_MSG}
-.endif # defined(WITH_KPILOT)
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>

deskutils/kdepim3/distinfo

@@ -1 +1 @@
-MD5 (KDE/kdepim-3.1.3.tar.bz2) = 7a556df5e5ae4c00c8bea4cd8f9c1f3e
+MD5 (KDE/kdepim-3.1.4.tar.bz2) = 2a3e97a2cd5de688294cb39001282048