Remove installing of Xft1 from XFree86-4-libraries, and add dependencies
to the Xft port by all the ports that use it along with whatever patches are
necessary.
Approved by: portmgr (kris), marcus
existent file [1]. This fixes unixODBC port GUI build.
o qt applications should be built with thread support per default.
Thus, add this to default qmake.conf for FreeBSD. [2]
o Bump PORTREVISION due to aforementioned
PR: 48303 [1]
Submitted by: Michael Collette <metrol@metrol.net> [1],
arved [2]
Reviewed by: Lauri Watts <lauri@kde.org> (FreeBSD KDE Team)
avoids problems with the packing list. I was unable to find any real-world
usage of Qt's NAS support, so out the window it goes.
PR: 46840
Requested by: mi (request denied)
2.OpenGL is now the DEFAULT configuration for Qt.
2a.The old WITH_OPENGL knob still works.
2b.The new knob WITHOUT_OPENGL disables OpenGL.
Approved by: will
2. Removed upgrade message. It's been there too long.
3. Removed opengl message. BROKEN is still there.
4. Changed a comment to be accurate about some bogus nutscrape headers.
FreeBSD port installs threaded version of qt (qt-mt), but qmake.conf is
installed withouth thread in the CONFIG variable. Because of that, qmake tried
to link with -lqt instead of -lqt-mt -pthread and fails. With thread in the
CONFIG everything works. This affects all ports that use qmake.
Folks, please test this (especially on current). It seems reasonable, is easy
to back out, I'm running a qt built with it right now.
Submitted by: Tilman Linneweh <tilman@arved.de>
2. No-op sleep after message if BATCH or PACKAGE_BUILDING.
3. Add NO_FILTER_SHLIBS to keep the qt lib names from getting munged.
4. Bump PORTREVISION because (3) changes installed pkg-plist, even though
one supplied in port does not change.
(3) will fix a message indicating the libfoo.so.1 does not exist on
pkg-deinstallation, too.
Credits:
1,2 due to Mikhail Teterin. 3 is from Will. 4 is common-sense.
to make sure user reads it, about rebuilding kdelibs, and generally, all
of KDE that is installed after the installation.
2. Bump PORTREVISION because of the critical nature of this problem.
PR: 41206
2. Add libfoo.so.X.0 links to file list, as they are created now [alane].
3. From PR 41144, fix minor portlint whitespace violations. The ?= assigns at
the top were not changed, in anticipation of a possible japanese/qt30
subport. Also fixed ref to qt2 doc location in pkg-descr. [fuyaki]
4. PORTREVISION not bumped, as installed files did not change and Makefile
changes were cosmetic only.
PR: 41144
Submitted by: Kimura Fuyuki <fuyuki@hadaly.org>
rigorous testing performed on the part of the KDE/FreeBSD Project
over the last three weeks. Thanks to everyone who helped test!
General changes:
[1] Follow KDE2 style by moving KDE core specific macros and
the like to x11/kde3/Makefile.kde.
[2] Fix a variety of comments or miscellaneous data to reflect
that this is KDE3 and not KDE2.
[3] Account for more empty directories in the PLISTs.
deskutils/kdepim3:
[4] More #include <malloc.h> -> #include <stdlib.h>.
audio/arts:
[5] Upgrade to 1.0.1.
[6] Point at MASTER_SITE_KDE not my own mirror.
audio/kdemultimedia3:
[7] Account for the removal of the <machine/soundcard.h> symlink.
Simply point all such includes at <sys/soundcard.h>.
editors/koffice-kde3:
[8] Get rid of #include <values.h> preemptively.
devel/kdesdk3:
[9] Remove cervisia from build if building on -CURRENT due to
C++-unsafe sys/wait.h. The header is believed to have been
fixed in newer -CURRENT (>= Jun 5) but we have not tested that.
devel/kdevelop:
[10] Upgrade to 2.1.1 and use KDE 3 version.
[11] Remove a number of suggested dependencies that no longer fit.
[12] Account for where the docs for Qt went since they got moved
to fit in hier(7) better.
graphics/kdegraphics3:
[13] Turn off kuickshow by default because it depends on imlib,
which in turn depends on gtk/glib. This will be revisited
when we split up the KDE ports a bit.
games/kdegames3:
[14] Fix compile error on -CURRENT where kpat/freecell-solver/md5.h
tried to define uint32_t after sys/types.h already had.
sysutils/kdeadmin3:
No particular changes.
misc/kdeaddons3:
No particular changes.
misc/kdeedu3:
[15] Re-add the huge number of missing @dirrm's.
misc/kdeutils3:
No particular changes.
misc/kde3-i18n-* and */kde3-i18n:
For the most part, no particular changes. A huge number of I18N
message updates went into this release, though.
french/kde3-i18n:
[16] Fix build Makefile error due to tarball builder's env.
net/kdenetwork3:
No particular changes.
x11-clocks/kdetoys3:
No particular changes.
x11/kdebase3:
[17] Account for mkfontdir "soft" build-time dependency. If
mkfontdir is available, use it to build fonts.dir where
kdebase installs fonts. Otherwise, don't bother.
[18] Patch ElectricEyes.desktop to use the name of the program
that FreeBSD uses when you install the port for it.
[19] Patches for KDM merged into KDE 3.0.1.
[20] Properly fix kdm/backend/xdmcp.c string format error.
x11/kdelibs3:
[21] Support the KDE3 version check to make sure no one
tries to install KDE2 then KDE3. The 'kde-version-check'
target is centralized in x11/kde3/Makefile.kde.
[22] Remove patch for kdeprint/configure.in.in.
[23] Add patch to fix critical icon loader bug.
x11/kde3:
[24] Add Makefile.kde for centralizing KDE core-specific macros
that don't belong in bsd.kde.mk.
x11-toolkits/qt30:
[25] Mark broken on any XFree86 version < 4 due to packing list
related problems if we tried to support XFree86 3.
[26] Error out if the user has Qt2 installed already.
x11-wm/kdeartwork3:
[27] Add USE_MESA to explicitly support the 3D screensavers.
[28] Re-add a large number of missing @dirrm's.
Credits:
[1] [4] [5] [6] [7]
[9] [10] [14] [16]
[21] [22] [24] [26]: will
[2] [3] [8] [15] [17]
[19] [25] [27] [28]: alane
[11] [12]
Submitted by: Lauri Watts <lauri@kde.org>
[13] Found by: mi
Removed by: will
[18] [23]
Submitted by: Andy Fawcett <andy@athame.co.uk>
Tested by: [in addition to the above, in no particular order]
knu
Mattias Douhan <matt@athame.co.uk>
Bradley T. Hughes <bhughes@trolltech.com>
Erik H. Bakke <ebakke@trolltech.com>
David Johnson <david@usermode.org>
JJ Behrens <jj@nttmcl.com>
Michael W. Collette <metrol@metrol.net>
Adriaan de Groot <adridg@sci.kun.nl>
Mark Rowlands <mark.rowlands@minmail.net>
Mark Stosberg <mark@summersault.com>
Dave Cantrell <phaedrus@alltel.net>
Mark Miller <joup@bigfoot.com>
Wesley Morgan <morganw@chemikals.org>
Arjan van Leeuwen <avl@operamail.com>
o Fix configure args to match what new configure accepts
o Use -qt-imgfmt-{jpeg,mng,png} to dynamically link the graphics
libs into libqt-mt.so
o Use image plugins (-plugin-imgfmt-{jpeg,mng,png}) if
WITH_IMAGE_PLUGINS; QTDIR=/usr/X11R6 needs to be set before
starting KDE if so
o Use Mesa libs if WITH_OPENGL. This will result in warnings both
before and after the build; the package will be called qt-opengl;
a warning will be displayed via pkg-message when the package is
installed
Submitted by: Alan E <ports@geeksrus.net>
Approved by: will
tailored ones
o Add patch-aa to handle current not patched distfile (it is already
incorporated in repo version)
o Uphold hier(7) for documentation installation
o Bump PORTREVISION
o Fixes sent by [1]. Coordinated by [2]
Submitted by: Lauri Watts <lauri@kde.org> [1]
Reviewed by: Alan E <ports@geeksrus.net> [2]
Approved by: will
o Deal with following issue: (weird)
"The following target is necessary if qt30 is installed at the time
the port build is started; it is related to the Makefiles having
dependencies on these (installed) .prl files." --AlanE
o Bump PORTREVISION
Submitted by: Alan E <alane@geeksrus.net>
Requested by: too many
Approved by: will
original versions of these ports, so some PORTREVISIONs were bumped. See
http://freebsd.kde.org/ and mailing lists linked to from there for info
on the packages generated to test these ports.
bsd.kde.mk has already been updated a few days ago to work with these.
Some patches applied to fix a few bugs were:
deskutils/kdepim3:
[1] Remove kpilot from build because it wasn't ready at release.
editors/koffice-kde3:
[2] Fix compile time bugs for FreeBSD.
misc/kdeedu3:
[3] Fix compile problem with kvoctrain.
x11/kdebase3:
[4] Fix KDM CPU usage and login bug.
Some caveats:
* All PLISTs are broken for deinstall due to script bug that I
didn't notice until very recently. This will be fixed when I
commit an update tomorrow. These ports should still install
perfectly fine though. They should also deinstall without
giving errors, but will leave directories behind.
* You can't install this with any other version of QT or KDE
already installed. I am not sure the checks are 100% working,
but fixes for these will be forthcoming. This is mainly due
to a policy decision made by kde@ to make QT/KDE ports install
the way the rest of the world expects it to while also still
conforming to FreeBSD's hier(7). For reference on this decision,
please consult the KDE/FreeBSD mailing list archives. This
decision fixes 2-year-old bug reports relating to how we handled
this for KDE2 vs KDE1.
Submitted by: [1] Adrian de Groot <adridg@cs.kun.nl>,
[2] David Faure <faure@kde.org>,
Andy Fawcett <andy@athame.co.uk>
Lauri Watts <lauri@kde.org>
[3] Lauri Watts <lauri@kde.org>
[4] Alan Eldridge <alane@geeksrus.net>
Oswald Buddenhagen <ossi@kde.org>
Reviewed by: kde
was slightly broken [1].
Allow alpha users to remove -O0 from CFLAGS if they so desire [2]. Replace
-O2 in config with whatever ${CFLAGS} happens to be, with a perl regex.
Submitted by: [1] sf
[2] naddy
the ECHO macro is set to "echo" by default, but it is set to "true" if
make(1) is invoked with the -s option while ECHO_CMD is always set to
the echo command.
* 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
maintain and improve QT/KDE on FreeBSD. This group (at this time)
consists of: demon, olgeni, kevlo, lauri@kde.org, rwatson, and will.
While I'm here, fail build of kdelibs11 if kdelibs2 is installed. This
was originally supposed to be committed with the 2.2 update, but...
bothering me about putting that in, 'cause I'm not doing it again! Even
if you do a patch that checks XFREE86_VERSION!
PR: 28728
Submitted by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
this involves is this: Cull GL from Qt by default, but still provide a
Qt+GL library that may or may not have threads. Then also provide a Qt
library that has threads but not GL. This allows us to make KDE2 depend
on a library that will *not* have threads, ever. Threads will be
revisited at a later date. Ports that require GL support need to be
updated to use the hacked library, libqtgl.so.4. The net result is that
we bloat our qt2 package by 1.5-2.5MB for compatability. Also, static
qt will not have GL support.
Introduce bsd.kde.mk, which will be tested on bento before becoming
fully activated.
Replace qt22-static with qt2-static, since it's just a proxy. Update
qt-designer to depend on qt23. Also make the old hack to package the
correct lib obsolete by using PLIST_SUB instead.
Miscellaneous changes: remove LIBQTFILE from CONFIGURE_ENV, it's not
used anymore. Solve namespace pollution problems with the devel/pth and
devel/libgnugetopt ports. Hopefully.
Suggested by: ade, asami, sobomax (bsd.kde.mk)
Repocopied by: asami (qt22-static --> qt2-static)
default -j2 (but keep MAKE_JOBS var), restore old perl REs as soon as I'd
learned how to do multiple ones, remove QPL license file from packaging,
sync with newest KOI8-U/R stuff (not tested). The biggest bonus: split
QT Designer into its own port, and make the qt22/qt-designer pair a member
of the master-slave ports legion, hopefully to reduce redundancy as much
as possible. This should also save roughly 20 minutes of compile time on
a dual PIII-600 for those that don't need or want QT Designer. UIC is,
however, still installed/compiled by the default Qt 2.2.4 (as it _is_
required for other things e.g. KDE2).
USE_MESA may break KDE2. Hopefully, now that the port does install both
the threaded and non-threaded versions of QT, it won't. But until the
next release of KDE2, I'm not gonna bother testing to see.
USE_MESA repeatedly requested by: sobomax
2.95.3. It's backwards compatible, so no need for OSVERSION or other
checks like that. Also add new var - MAKE_JOBS, which allows you to
adjust the -jN argument (I wanted this 'cause with more CPUs I can compile
with MAKE_JOBS=4 or greater). Methinks this kind of thing belongs in
bsd.port.mk, but anyway. I can now compile (with MAKE_JOBS=4) qt 1.45 in
less than 4 minutes on my dual PIII-600E. :)
Submitted by: sf (workaround)
Requested by: alex (workaround)
to garbanzo long ago), to reduce complications involved when building on
X4.0.2 with thread support. We don't need GL anyway. Bump PORTREVISION
(unconditionally this time) to 3.
Submitted by: Jeremy Shaffner <jeremy@external.org>
it doesn't really work (or so I've been told). This does not affect the
build for non-XFree86-4.0.2 users. Apologies for not getting this in
sooner.
Thanks to: Andrew <elitetek@flashcom.net> for loaning me access to a
fast machine with XFree86 4.0.2 to do my testing on, as
well as being the first one to contact me about this.
support is compiled in), untested because I don't have X4.0.2, but the
port works fine for the non-X4.0.2 case. Also substitute multiple perl
regexes on the same file for one sed regex. Add MAKE_ARGS=-j2 by default
since it makes QT compile faster even on uniprocessor systems.
I wanted to avoid putting the AA patch in CVS since it will be short-lived,
as the patch is in TrollTech's CVS and will most likely be released as part
of QT 2.2.4. Nevertheless, I thought I'd bring it in for the folks who
like bleeding edge.. since antialiasing most likely improves KDE2's look
and feel very much.
Submitted by: kevlo (AA patch)
Mikhail Teterin <mi@aldan.algebra.com> (-j2)
in the port.. although that support has been in QT 2.x for awhile. The
upgrade is also required for KDE 2.1 beta 1. Apologies to Kevin for
not getting it done sooner.
Remove a patch in configure by replacing it with "yes yes" to automate
accepting the GPL license (*sigh*) and avoiding interactive configure.
*THIS TIME* I checked to make sure *.so wasn't removed accidentally. ;-)
1.In Designer, don't rely on QTDIR environment being set when searching for
documentation and templates. Also correct search paths relatively to
QTDIR (/doc/html/... --> /share/doc/qt2/... etc.).
2.Install *all* documentation (previously index files and some pixmaps were
left behind, which was rendering help system mostly non-functional and
useless).
3.Install Designer's templates.
4.Don't use ${INSTALL_DATA} to install symbolic link to shared library - it
leads to the file this link points to being installed and as a result
two fully indentical versions of lib{qt2,util} are installed, wasting
user's HDD space (approx 8MB) and bloating package file (+3MB). Also
use ${INSTALL_PROGRAM} for shared libs to strip unneeded symbols.
I can address some of its issues (should see it marked un-broken in about
3 hours, if they're trivial enough). It took too long to get this update
out the door... :-(
This is a rather stable version of KDE2. Release is hoped for sometime
next month, so I'm going to try to reroll snapshots this weekend.
Also decide policy by removing the interactive requirement in qt22's
configure script. I don't know why they bothered adding it there..
Bugged by: *many* bug-reports, requests, etc.
After short discussion with Imura-san, back out GIF-by-default until I can
confirm whether or not there are license issues with Unisys. I will deal
with this later. I should note that I'd committed to qt2[12] previously
without conferring with him on the GIF issue first.
One big ouchie: I didn't even set MASTER_SITE/MASTER_SITE_SUBDIR on qt22
properly.. but oh well. Nobody's perfect. :-)
Things should be un-broken now.. please test these ports! I'll be trying
to update them to a new snap after a week or so.
Pointy hat: will
Patches graciously submitted by: nra
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 <jazepeda@pacbell.net>, Stephan Kulow <coolo@kde.org>, Harri
Porten <porten@kde.org>, Waldo Bastian <waba@kde.org>, Marc G. Fournier
<scrappy@hub.org>, Arun Sharma <adsharma@sharmas.dhs.org>, Matthias
Hoelzer-Kluepfel <mhk@caldera.de>, 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 <csg@physics.purdue.edu>, 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 <adsharma@sharmas.dhs.org>
Approved by: imura, asami
previous commit message to bsd.port.mk, which said INSTALL_SHLIBS. Boo.)
Line up the rhs of variable assignments nicely. Remove a couple of extra
whitespaces while I'm here.
Suggested by: sobomax
