Commit graph

127 commits

Author SHA1 Message Date
Ade Lovett
d3fc97c432 Remove pkg-comment from remaining master/slave port sets.
Approved by:	portmgr (implicitly)
2003-03-07 00:16:25 +00:00
Eric Anholt
38805e871a Remove the renaming of Xft headers and library from the Xft (Xft2) port.
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
2003-02-18 04:51:34 +00:00
Kris Kennaway
2deb746892 Protect targets with .if target(...) ... .endif for targets that are
redefined in slave ports.  Slave port maintainers need to check that
they aren't actually relying on the master port target to be executed.
2002-12-01 00:54:16 +00:00
Alan Eldridge
1d551159aa Exorcise the ghost of objprelink, which was killed and buried with kde2.
This should unbreak some things, like some errors from portsdb -Uu, as well
as the port build itself.
2002-09-11 13:33:55 +00:00
Kris Kennaway
c68436a7b7 Remove USE_NEWGCC, which is no longer supported or required.
Submitted by:   Tilman Linneweh <tilman@arved.de>
PR:             ports/40571
2002-08-31 02:44:07 +00:00
Will Andrews
dccd5a902e Block installation if Qt3 is already installed to prevent people from
clobbering the installations.

Submitted by:	lioux
2002-06-20 21:19:34 +00:00
Akinori MUSHA
53a6996210 Assign PORTREVISION using ?=' instead of =' so that slave ports can
override it.

PR:		ports/34779
Submitted by:	SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>
		(MAINTAINER of ja-{qt23,kde*2} ports)

Replace `cd dir && cmd' with `cd dir ; cmd' while I'm here.
2002-04-29 16:31:22 +00:00
Maxim Sobolev
57e4f10e06 Use correct -soname for qtgl shared library, so that libqtgl actually works.
Previously libqtgl.so.4 was libked with soname of libqt2.so.4, so that
when you link application with -lqtgl you are fine, but when you are trying
to run resulting application it dies because libqt2 (which has no GL code)
is dynamically linked instead.

Not objected by:	will
2002-04-27 11:39:15 +00:00
Kevin Lo
2a8d11c995 fix Makefile, thanks to roam@ 2002-02-19 16:51:06 +00:00
Kevin Lo
179bc9bd5f Fix OSVERSION, bad me. Pointed out by will. 2002-02-19 03:27:50 +00:00
Kevin Lo
623d410522 Add NO_QT_OBJPRELINK=yes, let -CURRENT installs smoothly.
Approved by: will
2002-02-19 02:15:42 +00:00
Will Andrews
d4c869e236 Remove -frerun-cse-after-loop, a vestige from the days when our compiler
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
2002-02-10 04:25:47 +00:00
Akinori MUSHA
a80f0bd0dd Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command;
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.
2002-01-29 12:14:18 +00:00
Will Andrews
91cebc67b9 Apply objprelink patch and use it only if MACHINE_ARCH=i386 *and*
NO_QT_OBJPRELINK isn't defined.  This was a little trickier than
fixing the KDE stuff, but I think this will work ok.

Requested by:	several
2002-01-05 03:16:03 +00:00
SADA Kenji
1b110d75a4 Enable to build this ports when you set MAKE_ENV on your shell environment. 2002-01-01 19:35:41 +00:00
Will Andrews
152d8bd12a Preemptive note to keep people from asking me questions about AA support. 2001-12-06 03:24:00 +00:00
Will Andrews
1d206a3483 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
2001-12-04 03:47:18 +00:00
Andrey A. Chernov
5676988fbd Bump png major 2001-09-11 03:32:41 +00:00
Dmitry Sivachenko
6845ee0376 Set DIST_SUBDIR=KDE 2001-09-10 20:22:28 +00:00
Akinori MUSHA
ceb034e832 Make MAINTAINER overridable for japanese/qt23. (I forgot to commit
this along with other kde* ports)
2001-09-01 02:45:38 +00:00
Will Andrews
fe68eec3e2 Reassign MAINTAINER to kde@FreeBSD.org, a group formed specifically to
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...
2001-08-25 02:17:59 +00:00
Will Andrews
0836a5f77d Add missing manpage.
PR:		29356
Submitted by:	Palle Girgensohn <girgen@partitur.se>
2001-08-17 17:43:11 +00:00
Will Andrews
5c8f6b17de Remove -xft since it doesn't work with older X11. Now will people stop
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>
2001-07-05 19:09:55 +00:00
Dmitry Sivachenko
7bc142a45b Add one more MASTER_SITE. 2001-07-04 09:07:11 +00:00
Will Andrews
f8e10954e5 Update to 2.3.1.
Submitted by:	mi
2001-07-03 02:47:10 +00:00
Nik Clayton
95c0850f6c Support building QT with debugging turned, keyed off the QT_DEBUG variable.
Approved by:	MAINTAINER
2001-06-22 08:46:34 +00:00
Nik Clayton
189b315edd Replicate the fixes in the other two patches when building qt23 with
debugging turned on.

Approved by:	MAINTAINER
2001-06-22 08:44:48 +00:00
Maxim Sobolev
4ca0e60800 -pthread --> ${PTHREAD_LIBS}
-D_THREAD_SAFE --> ${PTHREAD_CFLAGS}

Note: my first intention was to test this out on bento/beta, but per ade's
requiest I opted to do it quickly.
2001-03-29 16:35:19 +00:00
Will Andrews
5f3f502918 Fix last-minute change to avoid broken packaging for qt2-static.
Submitted by:	steve
2001-03-27 02:19:55 +00:00
Will Andrews
cd5ac27b08 Bring in my fixes for KDE2 for users of XFree86 4.0.x. Basically, what
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)
2001-03-24 22:15:59 +00:00
Dag-Erling Smørgrav
d478c90fa1 Ladies and gentlemen, I give you QT 2.3.0! 2001-03-14 01:29:17 +00:00
Will Andrews
847680b774 Fix build for alpha.
Found/Confirmed by:	steve
Fix submitted by:	gallatin
2001-03-10 17:06:18 +00:00
Will Andrews
18f7b3de2e Bump libmng shlib version.
Submitted by:	nrahlstr
2001-03-10 05:52:33 +00:00
Will Andrews
96dafc37e9 Fix PLIST.
Submitted by:	bento
2001-03-05 14:32:15 +00:00
Will Andrews
39bea9b297 Fix "yes" infinite loop.
Submitted by:	Rolf Edwards <redwards@meccamediagroup.com>
2001-03-05 12:00:08 +00:00
Alexander Langer
423a038944 Use a relative include for the files/manpages file. 2001-02-22 14:15:37 +00:00
Will Andrews
a29b482458 Update QT2 to 2.2.4: Re-add USE_MESA, remove antialiasing patch, remove
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
2001-02-04 04:43:14 +00:00
Maxim Sobolev
6569cc16e9 Add missed manpage.
Submitted by:	bento
2001-01-29 12:26:22 +00:00
Will Andrews
ec4c0231ad Fix bogons related to WANT_STATIC.
Submitted by:	jkh
2001-01-24 03:48:41 +00:00
Will Andrews
ceba73ff6e Add workaround (CFLAGS+=-frerun-cse-after-loops) for breakage in GCC
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)
2001-01-21 19:36:08 +00:00
Will Andrews
8fc0ba6af4 Install threaded qt2 library. Nuke GL dependency (should have listened
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>
2001-01-07 16:47:21 +00:00
Kevin Lo
51c33146f8 kio8-* encoding improvement
Submitted by: mi@aldan.algebra.com
Approved by:  will
2001-01-05 06:17:03 +00:00
Will Andrews
1ebd628ccb Fix build for XFree86 4.0.2 users: use threads by default in QT even though
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.
2000-12-26 04:07:50 +00:00
Will Andrews
bdffbec64a Add in antialiasing support (PORTREVISION conditional on whether AA
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)
2000-12-22 06:01:12 +00:00
Will Andrews
d7e451435e Update to QT 2.2.3. This upgrade includes the addition of MNG support
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.
2000-12-18 19:19:59 +00:00
Will Andrews
57fe8e3b3b Update to QT 2.2.2; mostly minor bugfixes. Required for KDE 2.0.1.
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.  ;-)
2000-12-06 06:27:16 +00:00
Maxim Sobolev
97ec9e3e03 Numerous fixes and improvements:
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.
2000-11-20 12:18:17 +00:00
Will Andrews
8658e1eacd Add GIF support by default.
Approved by:	jkh
2000-11-04 11:59:36 +00:00
Will Andrews
df8c06c68d Remove NO_LATEST_LINK=yes to facilitate QT2/KDE2.
Submitted by:	imura
2000-10-30 15:32:57 +00:00
Will Andrews
91cbc6e660 Sigh.. fix another bogon.. and take a logic class.
Submitted by:	Andrzej Tobola <san@tmp.iem.pw.edu.pl>
2000-10-29 05:38:04 +00:00