aboutsummaryrefslogtreecommitdiffstats
path: root/x11-clocks
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2001-12-04 11:47:18 +0800
committerwill <will@FreeBSD.org>2001-12-04 11:47:18 +0800
commitc468d09b79a9eac13941146231554832ce733e30 (patch)
tree7ce19e920fd8fee43a88c44cfcfaadc3081846dc /x11-clocks
parent38faa34b2d2a41011556bf2ccde4785a7cb7c584 (diff)
downloadfreebsd-ports-gnome-c468d09b79a9eac13941146231554832ce733e30.tar.gz
freebsd-ports-gnome-c468d09b79a9eac13941146231554832ce733e30.tar.zst
freebsd-ports-gnome-c468d09b79a9eac13941146231554832ce733e30.zip
Upgrade KDE to 2.2.2:
* General: - Support for objprelink. - Hack for autoconf 2.13/automake 1.4. Note that we can't use the standard USE_AUTO* because they change things in work/*; KDE has its own way of doing that. - Light cleanup of extra dirs in the PLISTs provided by my mkplistpkg[1] script. - Speedups of both compile and runtime through the usage of --disable-debug and --enable-final. The latter did not work with the kdemultimedia package, unfortunately. - Patch updates. * audio/kdemultimedia2: - Patch to fix KSCD on FreeBSD[2]. It works very well now. * deskutils/kdepim: - Enable kpilot[3]. Pull in the latest pilot-link stuff. * devel/kdesdk, * devel/kdevelop: - No specific changes. * devel/qt-designer: - Make this port depend almost entirely on qt23 to make it more maintainable, so I don't have to keep hacking the patches to get them to apply. * editors/koffice, * games/kdegames, * graphics/kdegraphics: - No specific changes. * misc/kdeaddons: - SDL is required now. Cull SDL PLIST_SUB and such. - Fix breakage from hardcoding "sdl-config". * misc/kdeutils2: - Fix problem with klaptopdaemon[4] where it didn't properly display the battery time. This patch is untested, but applied. * net/kdenetwork2: - Fix DCC for KSIRC[5]. - Remove ktalkd from the build. It requires some weird thing in the configure script that I don't have time to look at. * sysutils/kdeadmin: - No specific changes. * textproc/kdoc: - Remove bogus requirement that kdoc requires Perl 5.6.0; it sure seems to operate fine with >= 5.005. But I'll let time tell. * www/quanta: - No specific changes (--disable-debug support only). * x11/kde2: - No specific changes. * x11/kdebase2: - Fix ksysguard compile by merging the files from the HEAD branch of KDE CVS that were missing at release time for FreeBSD[6]. :\ * x11/kdelibs2: - Recognize CUPS' spinoff[7]. - Add libxslt dependency since it was removed from kdelibs. - Fix libxml compile problems[8] (accomplished by upgrading). - Remove libkformula from port Makefile; this library has been spun off into koffice. - Fix mode problems with DCOP[9]. This allows you to save files properly. It also seems to be a FreeBSD specific problem. - Fix bashisms in kdeprint/imagetops script[10]. * x11-clocks/kdetoys2: - No specific changes. * x11-toolkits/qt23: - Do NOT upgrade to QT 2.3.2[11]. - Allow devel/qt-designer to depend on this port entirely for the patches by adding a perlre to accomplish this. * x11-wm/kdeartwork: - No specific changes. Thanks to the FreeBSD/KDE[1] team[12] who helped me test these out! [1] http://freebsd.kde.org/; http://www.databits.net/cgi-bin/cvsweb.cgi/scripts/portbuild/mkplistpkg [2] Submitted by: Matthew Holmes <matt@speakeasy.net> [3] PR: 31914 Submitted by: Alan Eldridge <alane@geeksrus.net> [4] PR: 28475 Submitted by: Arun Sharma <arun@sharmas.dhs.org> [5] Submitted by: Luc Morin <luc_m@videotron.ca> [6] Found at: http://webcvs.kde.org/kdebase/ksysguard/ksysguardd/FreeBSD/ [7] PR: 32321 Reported by: gad Submitted by: James A. Halstead <jah4007@cs.rit.edu> [8] PR: 32055 Reported by: William Richard <wrichard@trivalley.com>, others [9] PR: 31629 Submitted by: Alan Eldridge <alane@geeksrus.net> [10] PR: 32358 Submitted by: Alexander N. Kabaev <ak03@gte.com> [11] PR: 31809 Requested by: Nathan Ahlstrom <nrahlstr@winternet.com> (denied) [12] http://freebsd.kde.org/contact.shtml; http://lists.csociety.org/pipermail/kde-freebsd; http://lists.csociety.org/listinfo/kde-freebsd
Diffstat (limited to 'x11-clocks')
-rw-r--r--x11-clocks/kdetoys2/Makefile27
-rw-r--r--x11-clocks/kdetoys2/distinfo2
-rw-r--r--x11-clocks/kdetoys2/pkg-plist2
-rw-r--r--x11-clocks/kdetoys3/Makefile27
-rw-r--r--x11-clocks/kdetoys3/distinfo2
-rw-r--r--x11-clocks/kdetoys3/pkg-plist2
-rw-r--r--x11-clocks/kdetoys4/Makefile27
-rw-r--r--x11-clocks/kdetoys4/distinfo2
-rw-r--r--x11-clocks/kdetoys4/pkg-plist2
9 files changed, 78 insertions, 15 deletions
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index c4af328004b6..f96cfa75a64f 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kdetoys
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= x11-clocks kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -14,11 +14,32 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
+ automake14:${PORTSDIR}/devel/automake14 \
+ objprelink:${PORTSDIR}/devel/objprelink
+
USE_KDELIBS_VER=2
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_AUTOCONF= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
USE_GMAKE= yes
+pre-configure:
+ ${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+ ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+ ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+ cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+ ${GMAKE} -f Makefile.cvs
+
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo
index b32b658436f6..71fb19eab148 100644
--- a/x11-clocks/kdetoys2/distinfo
+++ b/x11-clocks/kdetoys2/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdetoys-2.2.1.tar.bz2) = a106df7cbd681d2ef06185ee633d9de6
+MD5 (KDE/kdetoys-2.2.2.tar.bz2) = 67a90e965301997dc909229f643de22d
diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist
index 0f92726741ef..0be24e947d69 100644
--- a/x11-clocks/kdetoys2/pkg-plist
+++ b/x11-clocks/kdetoys2/pkg-plist
@@ -531,7 +531,6 @@ share/icons/locolor/32x32/apps/ktux.png
@dirrm share/icons/locolor
@dirrm share/icons/hicolor/48x48/apps
@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/16x16/apps
@dirrm share/doc/HTML/en/kworldclock
@dirrm share/doc/HTML/en/kteatime
@dirrm share/doc/HTML/en/kscore
@@ -564,3 +563,4 @@ share/icons/locolor/32x32/apps/ktux.png
@dirrm share/applnk/Toys
@dirrm share/applnk/System/ScreenSavers
@dirrm share/applnk/System
+@dirrm share/applnk
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index c4af328004b6..f96cfa75a64f 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kdetoys
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= x11-clocks kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -14,11 +14,32 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
+ automake14:${PORTSDIR}/devel/automake14 \
+ objprelink:${PORTSDIR}/devel/objprelink
+
USE_KDELIBS_VER=2
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_AUTOCONF= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
USE_GMAKE= yes
+pre-configure:
+ ${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+ ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+ ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+ cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+ ${GMAKE} -f Makefile.cvs
+
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index b32b658436f6..71fb19eab148 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdetoys-2.2.1.tar.bz2) = a106df7cbd681d2ef06185ee633d9de6
+MD5 (KDE/kdetoys-2.2.2.tar.bz2) = 67a90e965301997dc909229f643de22d
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index 0f92726741ef..0be24e947d69 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -531,7 +531,6 @@ share/icons/locolor/32x32/apps/ktux.png
@dirrm share/icons/locolor
@dirrm share/icons/hicolor/48x48/apps
@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/16x16/apps
@dirrm share/doc/HTML/en/kworldclock
@dirrm share/doc/HTML/en/kteatime
@dirrm share/doc/HTML/en/kscore
@@ -564,3 +563,4 @@ share/icons/locolor/32x32/apps/ktux.png
@dirrm share/applnk/Toys
@dirrm share/applnk/System/ScreenSavers
@dirrm share/applnk/System
+@dirrm share/applnk
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index c4af328004b6..f96cfa75a64f 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kdetoys
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= x11-clocks kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -14,11 +14,32 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
+ automake14:${PORTSDIR}/devel/automake14 \
+ objprelink:${PORTSDIR}/devel/objprelink
+
USE_KDELIBS_VER=2
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_AUTOCONF= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
USE_GMAKE= yes
+pre-configure:
+ ${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+ ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+ ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+ cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+ ${GMAKE} -f Makefile.cvs
+
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index b32b658436f6..71fb19eab148 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdetoys-2.2.1.tar.bz2) = a106df7cbd681d2ef06185ee633d9de6
+MD5 (KDE/kdetoys-2.2.2.tar.bz2) = 67a90e965301997dc909229f643de22d
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index 0f92726741ef..0be24e947d69 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -531,7 +531,6 @@ share/icons/locolor/32x32/apps/ktux.png
@dirrm share/icons/locolor
@dirrm share/icons/hicolor/48x48/apps
@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/16x16/apps
@dirrm share/doc/HTML/en/kworldclock
@dirrm share/doc/HTML/en/kteatime
@dirrm share/doc/HTML/en/kscore
@@ -564,3 +563,4 @@ share/icons/locolor/32x32/apps/ktux.png
@dirrm share/applnk/Toys
@dirrm share/applnk/System/ScreenSavers
@dirrm share/applnk/System
+@dirrm share/applnk