Commit graph

105 commits

Author SHA1 Message Date
wiz
dc06407ebd Convert to options framework. 2005-06-01 19:30:29 +00:00
jlam
95fd1f6ec9 Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
2005-06-01 18:02:37 +00:00
jlam
e5d77bae83 Remove USE_TOOLS+=gawk from packages that had it added solely for Solaris.
We rely on the tools framework to pull in a good enough awk tool.
2005-05-22 22:06:28 +00:00
jlam
585534220c Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison
2005-05-22 20:07:36 +00:00
reed
0932ec2ef6 On DragonFly use the FreeBSD G++ config for now.
This is from Jörg Sonnenberger in PR pkg/30255.
(Not tested by me.)
2005-05-17 15:34:46 +00:00
jlam
cd4f3767d3 Change references to M4 & YACC into TOOLS_M4 & TOOLS_YACC to simplify
transition to new tools framework.
2005-05-13 16:54:12 +00:00
wiz
559a5a8794 adam volunteered to maintain this package. 2005-04-18 13:22:17 +00:00
bouyer
24bad52695 qt3 build system makes a difference between MacOS X and Darwin: it will
build with X11 support on Darwin and MacOS X native interface on MacOS X.
But the Free qt3 only includes X11 support, and so the build fails on
MacOS X.
Change the build defines to use the same options on MacOS X and Darwin.
2005-04-13 21:58:05 +00:00
tv
7671a5504e Nuke USE_BUILDLINK3 (some files missed in megacommit). 2005-04-12 15:11:18 +00:00
wiz
393af94024 Add RMD160 checksums to the SHA1 ones. 2005-02-23 17:36:09 +00:00
adam
d5a1f53ba9 Changes 3.3.4:
Installation
---------------
Added support for DragonFly BSD.
Fixed compilation for 64-bit Linux.
Compilation fixes for OpenBSD configured with -thread.

Windows Installer
-----------------
Add option to set environment variables.
Fixed problem propagating PATH environment variable.
Make sure the PostgreSQL and MySQL libraries are shown correctly.

Compilers
---------
Work around a bug in HP-UX aCC.
Support IRIX with 7.4.x compiler.
Fixed moc compilation when Bison is installed.
Fixed compilation with Intel compiler on Windows.

Qt Designer
-----------
Fixed bug that could corrupt the .pro file.
Fixed bug that would remove source files from project when using a
statically linked designer.
Fixed handling of custom widget plugins which subclass QWidgetStack.
Raise and give focus to source files when clicking on them in the
project overview.
Fixed bug where empty variable declarations in .ui file would generate
improper C++ code.
Fixed crash when deleting action while changing its name.
Fixed crash when using third party plugins that create tabwidgets without any pages.
Fixed bug renaming slots in edit custom widgets dialog where old slot
name would not get removed.
Make sure uic-generated code compiles when QT_NO_CAST_ASCII is
defined.
Fixed bug showing wrong status indicators in connection table after
sorting the list.
Prevent templates based on unsupported widgets (like QScrollView) from
being created.

Qt Linguist
-----------
Fixed bug where spaces at the beginning or at the end of the source
text would not be displayed.

Qt Assistant
------------
Fixed bug in printing that sometimes caused the last page to be
skipped.
Fixed invalid font size error on startup.

qmake
-------
Work around bug in Visual Studio 2003 Custom Build Steps.
Handle path names with spaces properly.
Handle file names containing '&' characters correctly.
Create dependencies on .ui.h files.
Fixed crash on Solaris when error() string contains single quote.
Make it possible to specify a RES file for the vcproj file.
Fixed bug in make install on Linux
Various improvements for XCode.
Fixed bug in shadow builds.

for more information see 'changes-3.3.4'
2005-02-10 13:21:20 +00:00
wiz
6e02d7ee41 Rename ALL_TARGET to BUILD_TARGET for consistency with other *_TARGETs.
Suggested by Roland Illig, ok'd by various.
2004-12-03 15:14:50 +00:00
gavan
082e6a8069 Correct pasto. 2004-11-24 16:08:48 +00:00
gavan
4d7680266a Disable XRender on Solaris. Workaround for graphics corruption problems
experienced on Solaris 10.
2004-11-22 12:44:50 +00:00
jlam
af591191d2 Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added
automatically by pthread.buildlink3.mk.  Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).
2004-11-12 06:39:19 +00:00
grant
addf763609 remove patch backup files in mkspecs/ so they don't get mistakenly
installed.
2004-10-30 13:28:40 +00:00
gavan
2bc4048a48 Move USE_BUILDLINK3 into Makefile.common.
This change ensures that USE_BUILDLINK3 is defined before compiler.mk is
included.
2004-10-28 10:32:23 +00:00
gavan
69ea790b80 Pay attention to LDFLAGS when building qmake. This allows qmake to link
correctly against pkgsrc gcc.
2004-10-28 10:28:49 +00:00
markd
2ff1960657 Bring the qmake.conf we use in line with those from qt 3.3.3.
Bump PKGREVISION of qt3-tools.
Noted by Christoph Badura.
2004-10-19 13:27:48 +00:00
tv
00afe19a48 INSTALL_DATA -> INSTALL_LIB, where appropriate. 2004-10-13 15:43:43 +00:00
tv
257ee9c940 Another Interix-only fix: add -ldb, and since Qt incorrectly #includes
system C headers without extern "C", add extern "C" protection.
2004-10-13 15:15:52 +00:00
tv
4f001f9d15 Fix library linkage for Interix. 2004-10-13 12:06:36 +00:00
tv
227f63ba58 Add Interix 3.5 support. (Will be contributed back to Trolltech as well.) 2004-10-13 02:08:43 +00:00
tv
a62d3fb0e1 Extra PKGREVISION bump to cover the libtool/compiler-wrapper problems.
Since dependencies were actually failing to build, they fortunately don't
require PKGREVISION bumps themselves.
2004-10-07 16:36:47 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jlam
1a280185e1 Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".
2004-09-22 08:09:14 +00:00
jlam
89a609934d Change to use COMPILER_RPATH_FLAG. 2004-08-27 18:44:11 +00:00
jlam
ca70938428 Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
2004-08-27 06:29:06 +00:00
markd
da7a154ccf Bump PKGREVISION for patch to use modern resolver lib.
Noted by wiz.
2004-08-25 02:20:23 +00:00
markd
0bb87f5042 Use modern resolver api on recent NetBSD systems that have it.
From Love in PR 26638.
Fixes problems in threaded programs. eg psi and kde3.3's cups support.
2004-08-24 12:38:18 +00:00
adam
51c48b3161 Changes 3.3.3:
* Bug-fix release
2004-08-12 11:52:21 +00:00
markd
fba34fd12f Fix whitespace. 2004-08-11 14:18:12 +00:00
markd
8c7830b12f Set QMAKE_LFLAGS based on the value of LDFLAGS at the point that qmake is
run rather than when the qmake.conf was generated.  Should be effectively
equivalent to what was happening under buildlink2 and fixes linking
problems of audio/kmp and other qmake using packages.
2004-07-31 22:23:40 +00:00
markd
ab4f4fcf00 Be explicit about enabling or disabling cups support based on value of
USE_CUPS. Patch similar to that described by Bob Bernstein and Jeremy C.
Reed in tech-pkg@.

Fixes PR 26261 from Ian Zagorskih.
2004-07-13 13:14:41 +00:00
wiz
4237d54a34 Unused. 2004-07-06 22:41:15 +00:00
wiz
9fae5827ab Fix include paths for postgresql header files (for qt3-psql). 2004-07-06 16:59:04 +00:00
reed
cf91cf264b Convert qt3-libs to use BUILDLINK3. Based on patches from Joachim
Kuebart in PR#25753. Tested by myself on Linux and NetBSD 1.6.2_STABLE.
(Also tested on NetBSD 2.0_BETA by wiz@. And tested by jschauma
under Linux.)
2004-07-06 16:01:10 +00:00
adam
1b2d754678 Force building X11 version (not Carbon) under MacOSX 2004-05-10 06:47:09 +00:00
cjep
341efbf789 whitespace nits 2004-05-07 15:25:13 +00:00
adam
5570468860 Optimize qmake for speed-up 2004-04-30 11:29:00 +00:00
markd
e78f9f84bb Update to qt3 3.3.2.
Qt 3.3.2 is a bugfix release. It maintains both forward and backward
compatibility (source and binary) with Qt 3.3.1 and Qt 3.3.0.

X11 specific fixes:

Fixed crash bug when using X Input Method Chinput.

- Drag and Drop
        Ignores accelerator events when dragging.

- QClipboard
        Fixed bug where data()->format() would return the wrong value.
        Fixed potential crashes with regards to iterators.

- QFont
        Avoids badly scaled fonts, and prefers exact matches.
        Made sure symbol fonts get loaded correctly.
        Made it possible to load Latin fonts that do not contain the
        Euro symbol.
        Fixed glyph width bug observed with some Khmer fonts.
        Fixed crash with misconfigured Xft.
        Fixed problem with font selection for Xft2 when having Latin
        text with non-Latin locale.
        Respects custom dpi settings for Xft.
        Does not use Xft if we have FreeType1 but no XRender.
        Fixed memory leak in the font engine when drawing transformed
        fonts.

- QGL
        Fixed crash when rendering text in GL widgets.

- QLocale
        Tru64: Fixed crash when INFINITY is compared to another double.
        Tru64: Uses DBL_INFINITY for Compaq C++ compiler.

- QMimeSource
        Does not re-enter the event loop in provides().

- QPainter
        Fixed rendering of anti-aliased text on non-XRender enabled
        displays.

- QPrinter
        Fixed setFromTo().
        Fixed printing of Arabic text with XLFD fonts.

- QTextEdit
        Fixed bug with extremely long lines.

- QThread
        Fixed bug that made program require superuser privileges on
        some Linux machines.

- QWidget
        Fixed showFullScreen() and showMaximized() for window managers
        that do not support extended window manager hints (EWMH).
2004-04-29 12:53:05 +00:00
recht
1745a89ab0 Add QTDIR to BUILDLINK_PASSTHRU_DIRS in buildlink3.mk, so that bl3
packages could actually link against the qt libs.
2004-04-24 00:12:14 +00:00
recht
ec23ce840d update to 3.3.1
changes (among many others):

- New QLocale Class

- The ActiveQt framework, first available in Qt 3.1, has been enhanced in
  lots of ways in Qt 3.3.

- Semi-Transparent Windows

Other Improvements
- The network module now supports IPv6 in addition to IPv4.
- New 64-bit platforms are supported: Itanium on Linux (Intel compiler) and
  Windows (MSVC and Intel).
- QCursor now provides the BusyCursor shape, which combines an hourglass with
  an arrow.
- Qt's DOM classes are now reentrant when Qt is built with multithread support
  enabled.

See http://www.trolltech.com/products/qt/whatsnew.html for more details.
2004-04-16 14:30:44 +00:00
xtraeme
4052696ecd Teach qt's configure to find libraries/headers inside BUILDLINK_DIR, which
is mandatory if you want Xft2/Xrender support when using X11_TYPE=XFree86.
2004-03-30 21:50:19 +00:00
recht
26758b1ce9 Add buildlink3.mk 2004-03-30 18:58:34 +00:00
recht
5f95fb9727 Add missing Xrandr and xcursor buildlink2.mks.
Patch PKGREVISION to 1.
2004-03-29 09:27:11 +00:00
jlam
efa1ab70ba Include "../../mk/compiler.mk" to get the value of CC_VERSION before
testing it.
2004-02-18 13:33:40 +00:00
jlam
a1c40fc01e We no longer need to explicitly call ${BUILDLINK_*} for CC, CXX, LIBTOOL,
etc. because the bare variables will point to the correct executables.
2004-02-08 04:03:14 +00:00
jlam
17d1ca394e These packages need a C++ compiler. 2004-02-02 13:02:49 +00:00
jlam
3ac2d4b8aa In the new compiler selection framework, GCC_REQD is appended to, not
overridden.
2004-02-01 01:43:28 +00:00