2. Change gross kluge for klaptopdaemon to use DO_NOT_COMPILE.
3. Added WITH_KFLOPPY knob, defaults to undefined.
3A. If WITH_KFLOPPY is not defined, then we add kfloppy to DO_NOT_COMPILE.
4. Anything that got put in DO_NOT_COMPILE then gets passed in the env
to the configure script, which dutifully sets things up to not compile
it.
Approved by: kris
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>
Due to APM dependancies, its preventing the port from building on
alpha. Since I can't see what use its features would be on a
platform which doesn't support power mgmnt, it seems simplest to
just yank it.
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
- Move all stuff specific to kde core ports to x11/kde2/Makefile.kde.
+ Default to compile optimized for speed, not debugging, in ports
builds, not just packages. We don't really get that many backtraces
or debugging information, and there's a better way to provide these
things to people willing to spend some time working on KDE. It's
at (as announced before): http://freebsd.kde.org/.
- Remove teTeX dependency for kdegraphics2 upon request, and being unable
to find any reason not to. Apparently, kdegraphics still compiles
libkdvi and kdvi -- I guess dvips is merely a runtime dependency.
Therefore to enable its use one just needs to add the teTeX package.
Bump PORTREVISION to reflect dependency change.
- Fix koffice port by removing PYTHON_VERSION, which is unnecessary.
PR: 33650 (part of)
Submitted by: John Merryweather Cooper <jmcoopr@johncoop.MSHOME.bmi.net>
Reviewed by: kde-freebsd@lists.csociety.org (teTeX dep removal, and
optimizing for speed, not debugging capability)
--enable-debug and turn off stripping of binaries so we actually get all
the debugging we're supposed to get. :)
Submitted by: Alan Eldridge <alane@geeksrus.net>
make sure that the "autoconf" and "automake" binaries KDE looked for were
found and were autoconf213 and automake14 (as there are issues with the
latest versions), but the logic in setting $PATH was wrong. This puts
${WRKSRC}/auto-bin before the rest of the users $PATH. This fixes KDE
auto* problems if automake14 and automake-1.5 are both installed.
PR: 32512
Submitted by: Alan Eldridge <alane@geeksrus.net>
Approved by: will
* 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...
* All patches except sysutils/kdeadmin/files/patch-rpmMessages.c:
- Either obsoleted or merged into KDE.
* All pkg-plists:
- Huge diffs are due to mass conversion from static HTML pages
to XML/XSL versions.
* audio/kdemultimedia2:
- aRts + Noatun, etc. now work and play MP3s et al properly,
using the mpg123 aRtsplugin. Remove mpeglib[,_artsplug]
from compile.
* converters/kdesupport2:
- Obsolete. No longer used in this version of KDE.
* deskutils/kdepim:
- Use autoconf and account for brokenness in the configure
script by replacing invocations of INSTALL under libical
with the proper incantations.
- Per David O'Brien's request, move libimap to libkimap;
this was performed by Rik Hemsley <rikkus@kde.org>.
* devel/kdesdk:
- New module with some helpful tools. One in particular that
seems demanded is ``kbabel'', which, as I've been told, is
a translator's wet dream.
- Workaround dumb problem in kbabel's libgettext (which I could
not figure out how to remove) by replacing its error() with
errc(). KBabel seems to run fine with this patch.
* devel/kdevelop:
- Fix lame check for libkdeui.so.* by replacing it with just
a check for libkdeui.so. It's been/being removed from
kdevelop after 2.2.
* editors/koffice:
- Fix kivio compile errors by substituting in PTHREAD_LIBS
in the correct place. Compensate for kivio's dependency
on pthreads by changing kivio to use LD_PRELOAD=/usr/lib/libc_r.so
in kivio.desktop.
* games/kdegames2:
- Some new games.
* graphics/kdegraphics2:
- Fix link errors in libkscan and kamera where they
require gettext (ie: add -lintl).
- Fix compile error in kamera.cpp which is dependent on a
correctly done gphoto2.. of course, this will only help
people who've manually installed gphoto2 themselves.
* net/kdenetwork2:
- Mimelib was moved here (reason for removal of kdesupport2).
* misc/kdeaddons:
- New module to FreeBSD ports; some simple addons for KDE2.
Suggested by Lauri Watts <lauri@kde.org>.
* misc/kdeutils2:
- Added a couple manpages.
* x11-clocks/kdetoys2:
- Some new apps.
* sysutils/kdeadmin:
- Remove kuser from compile because it has some problems. ;\
* x11/kdelibs2:
- Add libFAM dependency to help people who run FAM; FAM
increases the overall desktop responsiveness.
Submitted by Lauri Watts <lauri@kde.org>.
- Add CUPS dependency to bring in KDE's new print system.
- Add bzip2/libxml2 dependencies to support the new help kioslave.
- Disable installation of libltdl stuff to prevent conflicts
with other stuff. Submitted by wjv.
- Add pkg-req script to avoid conflicts with kdelibs11; add
to Makefile too. Submitted by benno.
- Be sure to remove the pth header conflicts stuff from the
arts/mcop_mt section.
- Fix problem with configure trying to find -lfam in the
wrong place.
- Remove kspell and api subdirs from doc; we don't need them,
and there are problems trying to build/install them.
Submitted by Lauri Watts <lauri@kde.org>.
* x11/kdebase2:
- Solve link permissions problem by changing the modes on
files installed by kdesktop/init/Templates to 644.
Submitted by Jim Durham <durham@w2xo.pgh.pa.us>.
* x11/kde2:
- Bump version; no other changes.
Special thanks to Lauri Watts <lauri@kde.org> for helping me test
packages generated by these changes on a virgin system. I believe
that this is the best-tested update I've ever done for KDE, and it
really shines this time around.
I just noticed there are a couple other PRs in the PR db that need
to be addressed. I will take care of those by tomorrow. Sorry...
PR: 22735, 28549
Blanket approval by: demon (kdesdk, kdevelop)
- bsd.port.mk update to use bsd.kde.mk for USE_{QT,KDE}*
- Cleanup corresponding ports for bsd.kde.mk update.
- Fix bsd.kde.mk: use correct kdelibs dependency, put qt at the bottom,
introduce QT_NONSTANDARD variable for nonstandard configure setup.
- Update KDE2 to 2.1.1. Two patches included in x11/kdelibs2 to fix the
proxy authentication that was broken for 2.1.1. Remove old patches.
- Potentially fix kdelibs build for alpha.
- Fix qt-designer 2.3.0 build.
- Ruby stuff left alone since it looks like black magic to me. Should
still work w/ compat shims for older USE_QT[,2] style. Some others
were also left alone for the same reason.
Reviewed by: portmgr, ports (bsd.kde.mk+bsd.port.mk)
Submitted by: David Faure <faure@kde.org> (proxy auth patches)
Alex Zepeda <garbanzo@kde.org> (old patches removal)
the KDE team's excellent work, I am initiating burn sequence for KDE
1.x. All base KDE1 ports are hereby nuked. I am also reluctantly
reassuming maintainership of the KDE2 ports. Official KDE 2.1 packages
built for FreeBSD 4.2-STABLE w/ XFree86 4.0.2 are available on KDE's
official ftp mirrors now. Enjoy!
Note: It seems that the KDE people rerolled their kdelibs and kdebase
packages, and a quick examination of diffs reveal minor changes, but the
port should still work. I'll fix the packaging problems that bento runs
into.
Approved by: kevlo
to the final release of KDE 2.0. Kevin Lo <kevlo@FreeBSD.org> will continue
as the new maintainer. He has commit privileges on the KDE tree, making him
an excellent candidate for this job. I'll be behind the scenes for awhile,
since there are some structural changes I'd like to make but I'd rather have
Kevin do the work. Please, people, direct your patches at Kevin and watch
his "freetime deprivation process" _really_ start. :-P
have not tried KDE 2.0 or haven't done so in awhile (i.e. since July or
before), you should try this. This version is extremely stable and offers
better functionality than before. This update also introduces the KDE2
modules kdegraphics and kdemultimedia to our ports tree. Additionally,
this marks the first time FreeBSD packages were announced as part of the
KDE2 beta release announcement! :-)
Most (if not all) of the remaining modules in KDE2 will be added for the
update WRT the final release.
A hack was added to fix building with SSL in kdelibs; this has been merged
in the main tree and will go away with 2.0 release update. Thanks to David
Faure <david@mandrakesoft.com> for his help regarding this.
Also, building the docs should now succeed because I've added a build
dependency on jade and linuxdoc (should be enough).
People can get my precompiled packages from the usual location on the KDE
FTP server (should spread to the mirrors Real Soon Now (tm)):
http://ftp.kde.org/pub/kde/unstable/distribution/2.0Beta5/tar/FreeBSD/
Have fun! Remember to reports bugs through http://bugs.kde.org/.
dependencies to kde2, and add koffice to kde2, because it's part of the
2.0 release. Fix my bogon in forgetting to remove obsolete qt22 patches.
The current state of the ports as far as building and installing is quite
good, but I expect minor problems with PLISTs other than for the ones I've
fixed here. I'm going to let bento figure it out. :-)
Please, test these ports and report bugs to submit@bugs.kde.org, and send
me problems with the ports themselves. I've found that KDE2 seems to have
stabilized significantly since the last snapshot.
And now, I am removing the last patch remaining in the KDE2 ports, except
for the QT 2.2 snapshot.
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
Only changed giflib -> libungif in kdegraphics.
They realy do NOT want libgif, and do NOT use libgif anywhere.
Some ports are checking its existence in configure, but they
are nonsense at all!!
bsd.port.mk rev. 1.304 for details on the change.
The fix here is one of the following.
(1) Define USE_BZIP2 instead of BUILD_DEPENDS on bzip2 and redefining
EXTRACT_* commands.
(2) Change ${EXTRACT_CMD} to ${TAR} when the command is obviously
calling the "tar" command (i.e., arguments like "-xzf" are spelled
out).
(3) If ${EXTRACT_CMD} is called directly with ${EXTRACT_BEFORE_ARGS},
add ${EXTRACT_AFTER_ARGS} to the command line as well.
(4) If any of EXTRACT_CMD, EXTRACT_BEFORE_ARGS or EXTRACT_AFTER_ARGS
is set, define the other two too.
This port requireat least s version 1.41 of the Qt library.
There will be an error reported by configure, if only an earlier
version is found, but no automatic port dependency exists (i.e.
the x11-toolkits/qt141 port has to be manually built and installed).
There may still be a problem with a missing -lXext in the kdesupport
port. This will be taken care of during the next few days, if the
problem still exists ...
installs the version of the port that uses shared library number 9 and the
LIBRARY_VERSION set to the default. Normally this is against our policy
(bumping the version number for minor things), however due to the major
problems caused with the upgrade, Satoshi and I decided that this was best.
Approved by: asami
Creating package /usr/ports/packages/All/kdeutils-4.1b.tgz
Registering depends: giflib-3.0 jpeg-6b kdelibs-4.1b qt-1.31.
Creating gzip'd tar ball in '/usr/ports/packages/All/kdeutils-4.1b.tgz'
tar: can't add file share/applnk/Applications/kedit.kdelnk : No such file or directory
tar: can't add file share/apps/kjots/toolbar/OpenBook.xpm : No such file or directory
tar: can't add file share/apps/kjots/toolbar/filedel.xpm : No such file or directory
tar: can't add file share/apps/kljettool/pics/kljetlogo.xpm : No such file or directory
tar: can't add file share/doc/HTML/en/kjots/index.html : No such file or directory
tar: can't add file share/icons/kjots.xpm : No such file or directory
*** Error code 1
kdegames -> games/
kdenetwork -> net/
kdesupport -> converters/
kdeutils -> misc/
(Repository copy already done, dependency path and category name fixups
is being done in this commit.)
(2) Add a virtual category "kde" and add all six (incl. x11/kde{base,lib})
ports.
(3) Make package names follow the convention.
(4) Change "BUILD_DEPENDS=${X11R6}/bin/moc:..." to "...=moc:...".
There is no need to specify the full pathname if the target is an
executable in the standard path. (Actually, as the same port is
specified in LIB_DEPENDS, I think we can completely do away with
this line but since Stefan added this explicitly, I assume there
is a reason for it and left it alone.)
Approved by: se (all but 4)
