From 7c6b0a6ca67c232e3193583296b01e93dca141d0 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sat, 29 Jul 2000 02:44:58 +0000 Subject: Update to 20000724A (custom-rolled snapshot). Rejoice, because now Konqueror can load HTML documents, KOffice works semi-well, and KDE2 in general seems less buggy. Only kdeutils was left out of this mega-update. However, it should return soon. :-) The massive reduction in patches is mostly the result of using perl regex replacement. This reduces the amount of time it will take in the future to upgrade these ports, and load on the repository. QT 2.2.0beta0 (aka qt-copy) is officially enabled for the express purpose of allowing KDE2 to compile. It is available in the qt22 port. Additionally, GIF support is re-enabled in both Qt2 ports, so that people can now read GIF images. GIF support is enabled through an internal GIF reader in Qt, and requires no patented libraries. Special effort was made to ensure that people do not install both qt21 and qt22 ports at the same time. I'd like to take a moment to thank the following people for their help: Alex Zepeda , Stephan Kulow , Harri Porten , Waldo Bastian , Marc G. Fournier , Arun Sharma , Matthias Hoelzer-Kluepfel , and many others. Over 150 hours of hard work, testing, etc. were put into this update. Another couple hundred of hours were spent by CPUs trying to compile this behemoth. :-> Special thanks to: Physics Computer Network @ Purdue staff, especially C. Stephen Gunn , for giving me access to an extremely fast machine for doing test builds (it performed 12 full builds of the entire suite in the last 7 days). PR: 18838 Submitted by: Arun Sharma Approved by: imura, asami --- x11-clocks/kdetoys2/Makefile | 26 ++++++++++++++++---------- x11-clocks/kdetoys2/distinfo | 2 +- x11-clocks/kdetoys2/pkg-plist | 23 ++++++++++++----------- x11-clocks/kdetoys3/Makefile | 26 ++++++++++++++++---------- x11-clocks/kdetoys3/distinfo | 2 +- x11-clocks/kdetoys3/pkg-plist | 23 ++++++++++++----------- x11-clocks/kdetoys4/Makefile | 26 ++++++++++++++++---------- x11-clocks/kdetoys4/distinfo | 2 +- x11-clocks/kdetoys4/pkg-plist | 23 ++++++++++++----------- 9 files changed, 87 insertions(+), 66 deletions(-) (limited to 'x11-clocks') diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index f6f3b493660c..9ca79c44d1f6 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -6,25 +6,31 @@ # PORTNAME= kdetoys -PORTVERSION= 1.90 +PORTVERSION= 20000724A CATEGORIES= x11-clocks kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= unstable/distribution/tar/src +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= will MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -BROKEN= "Does not compile/run properly" +LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ + kdecore.4:${PORTSDIR}/x11/kdelibs2 +WRKSRC= ${WRKDIR}/kdetoys MOC?= ${X11BASE}/bin/moc2 -USE_QT2= yes +USE_NEWGCC= yes USE_BZIP2= yes -GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= DO_NOT_COMPILE=mouse MOC="${MOC}" + --with-qt-libraries=${X11BASE}/lib \ + --with-extra-libs=${LOCALBASE}/lib +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes +pre-install: + @(find ${WRKSRC} -name CVS | xargs rm -rf) + .include diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo index a28c79c03130..73ef581f8005 100644 --- a/x11-clocks/kdetoys2/distinfo +++ b/x11-clocks/kdetoys2/distinfo @@ -1 +1 @@ -MD5 (kdetoys-1.90.tar.bz2) = 6f8883a62031af941dd2b6cd529c7f61 +MD5 (kdetoys-20000724A.tar.bz2) = 91e240c893a1a07239d58516f0be60e6 diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist index c3145370d637..bfad8e3fe070 100644 --- a/x11-clocks/kdetoys2/pkg-plist +++ b/x11-clocks/kdetoys2/pkg-plist @@ -2,10 +2,12 @@ bin/amor bin/kmoon bin/kteatime bin/kworldwatch -share/applnk/Games/amor.kdelnk -share/applnk/Utilities/kmoon.desktop -share/applnk/Utilities/kteatime.desktop -share/applnk/Utilities/kworldwatch.desktop +lib/libkeyesapplet.la +lib/libkeyesapplet.so.1 +share/applnk/Toys/amor.desktop +share/applnk/Toys/kmoon.desktop +share/applnk/Toys/kteatime.desktop +share/applnk/Toys/kworldwatch.desktop share/apps/amor/b/b-f.xpm share/apps/amor/b/b-f2.xpm share/apps/amor/b/b1-r.xpm @@ -173,6 +175,7 @@ share/apps/amor/ghost/ghost_z5.xpm share/apps/amor/ghostrc share/apps/amor/tips-en share/apps/kdesktop/programs/kdeworld.desktop +share/apps/kicker/applets/eyesapplet.desktop share/apps/kmoon/pics/moon1.png share/apps/kmoon/pics/moon10.png share/apps/kmoon/pics/moon11.png @@ -202,13 +205,13 @@ share/apps/kmoon/pics/moon6.png share/apps/kmoon/pics/moon7.png share/apps/kmoon/pics/moon8.png share/apps/kmoon/pics/moon9.png -share/apps/kworldwatch/pics/bio_800.jpg -share/apps/kworldwatch/pics/depths_400.jpg +share/apps/kworldwatch/pics/bio_800.png +share/apps/kworldwatch/pics/depths_400.png share/apps/kworldwatch/pics/flag-blue.xpm share/apps/kworldwatch/pics/flag-green.xpm share/apps/kworldwatch/pics/flag-red.xpm share/apps/kworldwatch/pics/flag-yellow.xpm -share/apps/kworldwatch/pics/photo_400.jpg +share/apps/kworldwatch/pics/photo_400.png share/apps/kworldwatch/pics/world2.png share/doc/HTML/en/mouse/.anchors share/doc/HTML/en/mouse/compilationandinstallation.html @@ -220,6 +223,7 @@ share/doc/HTML/en/mouse/index.html share/doc/HTML/en/mouse/installation.html share/doc/HTML/en/mouse/introduction.html share/doc/HTML/en/mouse/onscreenoperation.html +share/icons/hicolor/32x32/apps/amor.png share/icons/hicolor/32x32/apps/kmoon.png share/icons/hicolor/32x32/apps/kworldwatch.png share/icons/hicolor/48x48/apps/kmoon.png @@ -228,18 +232,15 @@ share/icons/locolor/16x16/apps/amor.png share/icons/locolor/16x16/apps/kmoon.png share/icons/locolor/16x16/apps/kteatime.png share/icons/locolor/16x16/apps/kworldwatch.png -share/icons/locolor/32x32/apps/amor.png share/icons/locolor/32x32/apps/kmoon.png share/icons/locolor/32x32/apps/kworldwatch.png -@unexec rm -f %D/share/apps/amor/tips-default -@unexec rm -f %D/share/doc/HTML/en/mouse/common @dirrm share/doc/HTML/en/mouse @dirrm share/apps/kworldwatch/pics @dirrm share/apps/kworldwatch @dirrm share/apps/kmoon/pics @dirrm share/apps/kmoon +@dirrm share/apps/kicker/applets @dirrm share/apps/kdesktop/programs -@dirrm share/apps/kdesktop @dirrm share/apps/amor/ghost @dirrm share/apps/amor/eyes @dirrm share/apps/amor/blob diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index f6f3b493660c..9ca79c44d1f6 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -6,25 +6,31 @@ # PORTNAME= kdetoys -PORTVERSION= 1.90 +PORTVERSION= 20000724A CATEGORIES= x11-clocks kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= unstable/distribution/tar/src +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= will MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -BROKEN= "Does not compile/run properly" +LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ + kdecore.4:${PORTSDIR}/x11/kdelibs2 +WRKSRC= ${WRKDIR}/kdetoys MOC?= ${X11BASE}/bin/moc2 -USE_QT2= yes +USE_NEWGCC= yes USE_BZIP2= yes -GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= DO_NOT_COMPILE=mouse MOC="${MOC}" + --with-qt-libraries=${X11BASE}/lib \ + --with-extra-libs=${LOCALBASE}/lib +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes +pre-install: + @(find ${WRKSRC} -name CVS | xargs rm -rf) + .include diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo index a28c79c03130..73ef581f8005 100644 --- a/x11-clocks/kdetoys3/distinfo +++ b/x11-clocks/kdetoys3/distinfo @@ -1 +1 @@ -MD5 (kdetoys-1.90.tar.bz2) = 6f8883a62031af941dd2b6cd529c7f61 +MD5 (kdetoys-20000724A.tar.bz2) = 91e240c893a1a07239d58516f0be60e6 diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist index c3145370d637..bfad8e3fe070 100644 --- a/x11-clocks/kdetoys3/pkg-plist +++ b/x11-clocks/kdetoys3/pkg-plist @@ -2,10 +2,12 @@ bin/amor bin/kmoon bin/kteatime bin/kworldwatch -share/applnk/Games/amor.kdelnk -share/applnk/Utilities/kmoon.desktop -share/applnk/Utilities/kteatime.desktop -share/applnk/Utilities/kworldwatch.desktop +lib/libkeyesapplet.la +lib/libkeyesapplet.so.1 +share/applnk/Toys/amor.desktop +share/applnk/Toys/kmoon.desktop +share/applnk/Toys/kteatime.desktop +share/applnk/Toys/kworldwatch.desktop share/apps/amor/b/b-f.xpm share/apps/amor/b/b-f2.xpm share/apps/amor/b/b1-r.xpm @@ -173,6 +175,7 @@ share/apps/amor/ghost/ghost_z5.xpm share/apps/amor/ghostrc share/apps/amor/tips-en share/apps/kdesktop/programs/kdeworld.desktop +share/apps/kicker/applets/eyesapplet.desktop share/apps/kmoon/pics/moon1.png share/apps/kmoon/pics/moon10.png share/apps/kmoon/pics/moon11.png @@ -202,13 +205,13 @@ share/apps/kmoon/pics/moon6.png share/apps/kmoon/pics/moon7.png share/apps/kmoon/pics/moon8.png share/apps/kmoon/pics/moon9.png -share/apps/kworldwatch/pics/bio_800.jpg -share/apps/kworldwatch/pics/depths_400.jpg +share/apps/kworldwatch/pics/bio_800.png +share/apps/kworldwatch/pics/depths_400.png share/apps/kworldwatch/pics/flag-blue.xpm share/apps/kworldwatch/pics/flag-green.xpm share/apps/kworldwatch/pics/flag-red.xpm share/apps/kworldwatch/pics/flag-yellow.xpm -share/apps/kworldwatch/pics/photo_400.jpg +share/apps/kworldwatch/pics/photo_400.png share/apps/kworldwatch/pics/world2.png share/doc/HTML/en/mouse/.anchors share/doc/HTML/en/mouse/compilationandinstallation.html @@ -220,6 +223,7 @@ share/doc/HTML/en/mouse/index.html share/doc/HTML/en/mouse/installation.html share/doc/HTML/en/mouse/introduction.html share/doc/HTML/en/mouse/onscreenoperation.html +share/icons/hicolor/32x32/apps/amor.png share/icons/hicolor/32x32/apps/kmoon.png share/icons/hicolor/32x32/apps/kworldwatch.png share/icons/hicolor/48x48/apps/kmoon.png @@ -228,18 +232,15 @@ share/icons/locolor/16x16/apps/amor.png share/icons/locolor/16x16/apps/kmoon.png share/icons/locolor/16x16/apps/kteatime.png share/icons/locolor/16x16/apps/kworldwatch.png -share/icons/locolor/32x32/apps/amor.png share/icons/locolor/32x32/apps/kmoon.png share/icons/locolor/32x32/apps/kworldwatch.png -@unexec rm -f %D/share/apps/amor/tips-default -@unexec rm -f %D/share/doc/HTML/en/mouse/common @dirrm share/doc/HTML/en/mouse @dirrm share/apps/kworldwatch/pics @dirrm share/apps/kworldwatch @dirrm share/apps/kmoon/pics @dirrm share/apps/kmoon +@dirrm share/apps/kicker/applets @dirrm share/apps/kdesktop/programs -@dirrm share/apps/kdesktop @dirrm share/apps/amor/ghost @dirrm share/apps/amor/eyes @dirrm share/apps/amor/blob diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index f6f3b493660c..9ca79c44d1f6 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -6,25 +6,31 @@ # PORTNAME= kdetoys -PORTVERSION= 1.90 +PORTVERSION= 20000724A CATEGORIES= x11-clocks kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= unstable/distribution/tar/src +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= will MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -BROKEN= "Does not compile/run properly" +LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ + kdecore.4:${PORTSDIR}/x11/kdelibs2 +WRKSRC= ${WRKDIR}/kdetoys MOC?= ${X11BASE}/bin/moc2 -USE_QT2= yes +USE_NEWGCC= yes USE_BZIP2= yes -GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= DO_NOT_COMPILE=mouse MOC="${MOC}" + --with-qt-libraries=${X11BASE}/lib \ + --with-extra-libs=${LOCALBASE}/lib +CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++" USE_GMAKE= yes +pre-install: + @(find ${WRKSRC} -name CVS | xargs rm -rf) + .include diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo index a28c79c03130..73ef581f8005 100644 --- a/x11-clocks/kdetoys4/distinfo +++ b/x11-clocks/kdetoys4/distinfo @@ -1 +1 @@ -MD5 (kdetoys-1.90.tar.bz2) = 6f8883a62031af941dd2b6cd529c7f61 +MD5 (kdetoys-20000724A.tar.bz2) = 91e240c893a1a07239d58516f0be60e6 diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist index c3145370d637..bfad8e3fe070 100644 --- a/x11-clocks/kdetoys4/pkg-plist +++ b/x11-clocks/kdetoys4/pkg-plist @@ -2,10 +2,12 @@ bin/amor bin/kmoon bin/kteatime bin/kworldwatch -share/applnk/Games/amor.kdelnk -share/applnk/Utilities/kmoon.desktop -share/applnk/Utilities/kteatime.desktop -share/applnk/Utilities/kworldwatch.desktop +lib/libkeyesapplet.la +lib/libkeyesapplet.so.1 +share/applnk/Toys/amor.desktop +share/applnk/Toys/kmoon.desktop +share/applnk/Toys/kteatime.desktop +share/applnk/Toys/kworldwatch.desktop share/apps/amor/b/b-f.xpm share/apps/amor/b/b-f2.xpm share/apps/amor/b/b1-r.xpm @@ -173,6 +175,7 @@ share/apps/amor/ghost/ghost_z5.xpm share/apps/amor/ghostrc share/apps/amor/tips-en share/apps/kdesktop/programs/kdeworld.desktop +share/apps/kicker/applets/eyesapplet.desktop share/apps/kmoon/pics/moon1.png share/apps/kmoon/pics/moon10.png share/apps/kmoon/pics/moon11.png @@ -202,13 +205,13 @@ share/apps/kmoon/pics/moon6.png share/apps/kmoon/pics/moon7.png share/apps/kmoon/pics/moon8.png share/apps/kmoon/pics/moon9.png -share/apps/kworldwatch/pics/bio_800.jpg -share/apps/kworldwatch/pics/depths_400.jpg +share/apps/kworldwatch/pics/bio_800.png +share/apps/kworldwatch/pics/depths_400.png share/apps/kworldwatch/pics/flag-blue.xpm share/apps/kworldwatch/pics/flag-green.xpm share/apps/kworldwatch/pics/flag-red.xpm share/apps/kworldwatch/pics/flag-yellow.xpm -share/apps/kworldwatch/pics/photo_400.jpg +share/apps/kworldwatch/pics/photo_400.png share/apps/kworldwatch/pics/world2.png share/doc/HTML/en/mouse/.anchors share/doc/HTML/en/mouse/compilationandinstallation.html @@ -220,6 +223,7 @@ share/doc/HTML/en/mouse/index.html share/doc/HTML/en/mouse/installation.html share/doc/HTML/en/mouse/introduction.html share/doc/HTML/en/mouse/onscreenoperation.html +share/icons/hicolor/32x32/apps/amor.png share/icons/hicolor/32x32/apps/kmoon.png share/icons/hicolor/32x32/apps/kworldwatch.png share/icons/hicolor/48x48/apps/kmoon.png @@ -228,18 +232,15 @@ share/icons/locolor/16x16/apps/amor.png share/icons/locolor/16x16/apps/kmoon.png share/icons/locolor/16x16/apps/kteatime.png share/icons/locolor/16x16/apps/kworldwatch.png -share/icons/locolor/32x32/apps/amor.png share/icons/locolor/32x32/apps/kmoon.png share/icons/locolor/32x32/apps/kworldwatch.png -@unexec rm -f %D/share/apps/amor/tips-default -@unexec rm -f %D/share/doc/HTML/en/mouse/common @dirrm share/doc/HTML/en/mouse @dirrm share/apps/kworldwatch/pics @dirrm share/apps/kworldwatch @dirrm share/apps/kmoon/pics @dirrm share/apps/kmoon +@dirrm share/apps/kicker/applets @dirrm share/apps/kdesktop/programs -@dirrm share/apps/kdesktop @dirrm share/apps/amor/ghost @dirrm share/apps/amor/eyes @dirrm share/apps/amor/blob -- cgit v1.2.3