Commit graph

100 commits

Author SHA1 Message Date
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
Will Andrews
ea141aa768 Add a blurb that tells users that GIF support is disabled by default
and why, and how to enable it.
2000-10-29 03:35:18 +00:00
Will Andrews
a80e044100 Update to QT 2.2.1 / KDE 2.0 final release. At last! What a long road...
All KDE2 ports now use default USE_QT2.  Still todo: Merge in MTREE stuff.
2000-10-25 03:33:54 +00:00
Satoshi Asami
f94d333d6d @dirrm share/doc/qt2/html/designer/stylesheet-images
Submitted by:	bento
2000-10-17 11:26:47 +00:00
Will Andrews
a7872bd7a7 Mental note: be sure to double-check the PLIST. This stylesheet-images
directory's files were deleted as part of the upgrade to QT 2.2.0.

Submitted by:	trevor
Found by:	bento
2000-10-15 17:55:33 +00:00
Will Andrews
2710ce5935 Add WANT_STATIC option, basically it adds support for compiling a static
library, useful for things like libh.  Bump PORTREVISION accordingly.

Submitted by:	nra
2000-09-17 01:57:06 +00:00
Will Andrews
ce35bfdf18 Update to QT 2.2.0 release. Satoshi will handle the USE_QT2 upgrade, which
should happen sometime later this week.  Yes, this is *THE* QT that will be
used with KDE2.  :-)

Submitted by:	nra  (thanks for making my job easier)
2000-09-12 07:50:45 +00:00
Satoshi Asami
0c25ff5be7 Typo (qanvasview -> qcanvasview).
Submitted by:	obento
2000-09-09 21:03:39 +00:00
Will Andrews
f73cb89da6 Update the manpage listing.
Submitted by:	new-bento (by way of asami)
2000-09-08 08:58:50 +00:00
Will Andrews
763de026f3 Update to 20000829A snapshot. Disable kdenetwork2 for the time being so
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.
2000-08-29 23:44:32 +00:00
Satoshi Asami
6191a999a4 Add one manpage and one shlib link.
Submitted by:	bento
2000-08-13 05:29:18 +00:00
Will Andrews
fe37e660dc Re-add GL; it was my mistake in removing it - I'd assumed that GL was still
merely an "extension" as it was in Qt 1.45 and hence not needed.

Submitted by:	asami, rwatson, and many others
2000-08-11 04:45:39 +00:00
Will Andrews
ad0ed0dd04 Fix my not-tested-enough KDE2-related ports. :-(
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
2000-07-30 02:00:50 +00:00
Will Andrews
7c6b0a6ca6 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 <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
2000-07-29 02:44:58 +00:00
Maxim Sobolev
6db96c0500 Bump png shared library version.
Submitted by:	Hajimu UMEMOTO <ume@mahoroba.org>
2000-07-04 07:13:35 +00:00
Satoshi Asami
ffb21b5654 Rename INSTALLS_SHLIBS to INSTALLS_SHLIB. (There was a typo in the
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
2000-06-16 21:52:40 +00:00
Maxim Sobolev
61ebd322a2 Fix MASSIVE typo INSTALL_SHLIBS --> INSTALLS_SHLIBS, which occured because I
just cun'n'pasted the name from Satoshi's commit message without checking
it.

Hall of shame entry:	sobomax
2000-06-16 08:19:52 +00:00
Maxim Sobolev
835d6b8655 Third round of INSTALL_SHLIBS=yes fixes. 2000-06-15 17:59:45 +00:00
Will Andrews
c68d808762 Allow HAVE_UNISYS_LICENSE to work too.
PR:		19058
Submitted by:	Mikhail Teterin <mi@privatelabs.com>
2000-06-09 03:08:06 +00:00
R. Imura
5f232b2a59 Update to version 2.1.1. 2000-05-30 15:31:12 +00:00
R. Imura
c20025cfe6 Update to version Qt-2.1.0 ! 2000-04-14 16:07:58 +00:00
R. Imura
f8f5ce4d81 Update to version Qt-2.1.0 beta4.
- Added support of X Session Management.
- MASTER_SITES and WWW changed. ( troll.no -> trolltech.com )
2000-04-14 16:04:55 +00:00
Chris Piazza
458db42f26 Update with the new PORTNAME/PORTVERSION variables 2000-04-10 01:11:24 +00:00
R. Imura
6649250ade Update to version 2.1.0 beta3.
Added libqxt.a which is from extensions.
2000-03-24 15:59:25 +00:00
Justin M. Seger
7cc807dbea Changed LIB_DEPENDS: MesaGL.14->GL.14 due to Mesa-3.1 upgrade 2000-03-20 23:25:21 +00:00
R. Imura
ff061bc917 Update to Qt Free Edition version 2.1.0 Beta 2.
1) Bump lib's version, since qt-2.1.0 loses lower compatibility
   with qt-2.0.2 but has only upper compatibility. (new qt binary
   does not work with old qt library)

2) Install libqgl.a (it works with its examples) in addition to libqt,
   so added LIB_DEPENDS to MesaGL.

3) JPEG support from extension had been included to the main library.

4) 'examples' and 'tutorials' are no longer built with port building,
   since they are never installed. If you want them, set
   QTDIR=/usr/ports/x11-toolkits/qt21/work and just type 'gmake' in each
   directories.

Some ideas obtained from qt145. :)
2000-03-06 18:24:03 +00:00
Satoshi Asami
e25d5b46d1 Mark this port FORBIDDEN after a repo-copy while Imura-san works on an
upgrade.
2000-03-03 18:54:52 +00:00
R. Imura
6a86bca911 Decrease a patch. 1999-11-26 20:31:17 +00:00