Commit graph

102 commits

Author SHA1 Message Date
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
0e11add0b7 Remove explicit dependencies on the GNU m4 package with USE_TOOLS+=m4
and appropriate TOOLS_DEPMETHOD.gm4 settings.
2005-05-22 20:51:45 +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
wiz
235b8fda58 Fix AC_DEFUN argument quoting for automake 1.8 and newer. No
PKGREVISION bump because most people won't care.
2005-04-27 11:05:42 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
salo
fd011562ca Security fix for CAN-2005-0891:
"David Costanzo has reported a vulnerability in GdkPixbuf, which can be
 exploited by malicious people to crash certain applications on a user's
 system.

 The vulnerability is caused due to a double free error in the BMP loader.
 This can be exploited to crash an application linked against GdkPixbuf
 when a specially crafted BMP image is processed."

Bump PKGREVISION.  Patch from Fedora.
2005-04-01 11:37:23 +00:00
agc
6a7b384635 Add RMD160 digests 2005-02-24 08:45:01 +00:00
tv
6ba698c58f Pull in asm symbol fixes for Interix from gtk2. 2005-01-25 04:58:01 +00:00
cube
5c2532320e Fix a long-standing bug in io-gif.c. It remained unnoticed until Georg
Schwarz tried to compile it with a compiler that errors out when the code
does something as pointless as checking if a pointer is positive.

PR#28889 and http://bugzilla.gnome.org/show_bug.cgi?id=156186
2005-01-15 00:10:41 +00:00
reed
e117eda090 Bump PKGREVISIONs due to libtiff update.
Some BUILDLINK_RECOMMENDED bumps done also.

(If I missed any, please let me know -- and let me know a good
way to automate this.)
2004-12-28 23:18:15 +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
snj
398301ef04 No longer used. 2004-05-09 06:50:29 +00:00
xtraeme
b2ba79064b s/USE_X11BASE/USE_X11/ in graphics/gdk-pixbuf. Bump PKGREVISION. 2004-04-25 04:15:43 +00:00
xtraeme
4b23c944db Add missing BUILDLINK_CPPFLAGS as was present in bl2, needed to build
some apps.
2004-04-11 16:51:32 +00:00
jlam
7db11b582a Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 09:12:08 +00:00
jlam
9ff0e10340 Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 19:25:06 +00:00
dmcmahill
23e06e0609 enable pkgviews for this pkg 2004-02-17 02:45:21 +00:00
jlam
804a4bd6cd bl3ify 2004-02-15 12:47:35 +00:00
jlam
ec993afa1a LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
2004-02-14 17:21:32 +00:00
grant
59daad6697 replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-24 15:46:42 +00:00
reed
6d9af8d68d Bump package revisions for tiff update.
Tiff is backward compatible, but was broken on amd64 platform
so this makes sure new tiff is used.
2004-01-03 18:49:33 +00:00
martti
ee90b572a6 COMMENT should start with a capital letter. 2003-07-21 16:45:54 +00:00
grant
4083b24390 s/netbsd.org/NetBSD.org/ 2003-07-17 21:31:04 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +00:00
jschauma
874df2b597 s/packages@/tech-pkg@/g
(Forgot the last time we did this.  Pointed out by Sergey
Svishchev (svs at ropnet dot ru))
2003-06-23 14:23:13 +00:00
jmmv
4b47f36617 Line up PKGREVISION whitespace. 2003-05-05 16:32:24 +00:00
wiz
7166660e08 Dependency bumps, needed because of devel/pth's major bump, and related
dependency bumps.
2003-05-02 11:53:34 +00:00
wiz
7fc3179980 Update to 0.22. Remove dependency on auto* by adding patches for the
generated files.

(Not portability) changes since 0.18:
* Made the GIF loader handle animations with frames whose bounds go outside
  of the base image's bounds (Federico).
* Made the GIF loader handle zero-sized frames that GifBuilder and
  similar crap spits sometimes (Federico).
* The PNM loader doesn't abort() anymore if it cannot allocate memory
  (Federico).
* Fixed a g_object_unref() -> gdk_pixbuf_unref() thinko (Federico).
* Merged the patch from Red Hat Linux 8.0 to fix the crash on
  corrupted/short GIFs - Ximian 29040 (patch by Elliot Lee).
* Fixed the RGB 565 LSB -> MSB case in gdk-pixbuf-drawable - 79463
  (Federico).
* Fixed the update region notification in the BMP loader (Federico).
* Merged the BMP loader changes from GTK+ HEAD -- check all reallocs,
  fix 16bpp BI_RGB thinko, properly handle BI_RLE4 and skips and jumps
  (changes by Matthias Clasen).
* Merged the ICO loader changes from GTK+ HEAD (changes by Matthias
  Clasen).
* Merged changes from gtk+/gdk-pixbuf HEAD into the JPEG loader --
  fixes CMYK JPEG problems (changes by Matthias Clasen).
2003-01-15 21:03:25 +00:00
bouyer
0d1bc60837 Regen: rearrange patch-aa to keep solaris9's patch happy. 2002-10-20 22:37:36 +00:00
bouyer
e3fdba6715 Rearrange patch-aa to keep Solaris9's patch happy. 2002-10-20 22:36:46 +00:00
wiz
ef21a3d5d3 regen patch, so that it should work on Solaris. Addresses PR 18640. 2002-10-17 19:23:45 +00:00
wiz
e8a08c3fc3 Unused. 2002-10-08 18:51:36 +00:00
wiz
1bfeff5e3a Use automake.mk and autoconf.mk. 2002-10-02 22:08:44 +00:00
jlam
ee12419f1f Instead of using BUILDLINK_TRANSFORM.<pkg> to change the location of
headers in ${BUILDLINK_DIR}, simply create BUILDLINK_CPPFLAGS.<pkg>
variables whose values are appended to CPPFLAGS, which are automatically
passed to the configure and build processes.

BUILDLINK_TRANSFORM.<pkg> has little use in buildlink2 since packages are
now told that the software may be found where it really is installed, not
in ${BUILDLINK_DIR} as was the case with buildlink1.  Eventually, these
variables will be declared unsupported by buildlink2.
2002-09-23 09:22:14 +00:00
jlam
93e9fce64c buildlink2.mk files don't need to symlink *Conf.sh files. 2002-09-11 10:15:33 +00:00
jlam
32f916b07a Move the USE_BUILDLINK2 definition to the common Makefile as we need to
include buildlink2.mk files from there.
2002-09-11 10:12:38 +00:00
drochner
5237ff423e -make this build if gnome libs are installed
-being here, update to 0.18.0
 changes:
* Fixed the RGB 565 MSB -> MSB case in gdk-pixbuf-drawable - #79190
* Fixed alignment issues in the BMP loader - #84083 (Federico).
* Merged pixops.c from GTK+ HEAD as of 2002/Jun/18 (Federico).
2002-09-02 13:10:08 +00:00
jlam
436fd9d391 Convert gdk-pixbuf-gnome from buildlink1 to buildlink2, and remove the
special buildlink1 handling in the common Makefile.
2002-08-28 15:49:04 +00:00
jlam
e2afa97f51 Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
2002-08-25 18:38:05 +00:00
fredb
13d78b36ae Work around a gcc-2.95.3/m68k optimization bug, reported by Klaus Heinz
in PR pkg/17553.
2002-07-19 04:33:29 +00:00
veego
b41e497a74 Add a missing SPACE, which was gone in the last commit and would result in
build errors due to two -I's with no space between them.
2002-05-14 18:43:52 +00:00
tron
0d3103b5e8 Make sure that include files appear under well known locations in the
buildlink directory. This fixes build problems in e.g. the "gnome-games"
package.
2002-05-14 09:04:41 +00:00
rh
0b2a39425c Add an explicit dependency on autoconf-2.13. This closes PR 16764 by
<jaco@teaser.fr>
2002-05-12 21:39:20 +00:00
rh
4e687431bf Update gdk-pixbuf and gdk-pixbuf-gnome to 0.17. Changes include:
* Merged the endianness conversion fixes from the GDK version into the
  Xlib version; oops (Federico).

* Merged fixes from GTK+ 2.0

* Minor documentation improvements (Federico).

* Fixed endianness conversion in the 16-bit gdk-pixbuf-drawable
  functions (Federico).

* Minor fixes for the IBM/AIX compiler (Christian Schaller).

* The image loaders are now linked against the pixbuf and GTK+
  libraries so that the Python bindings work (Johan Dahlin).

* Backported the BMP loader from GTK+ 1.3 (Federico).

* Added support for BI_BITFIELDS coding to the BMP loader [Ximian bug
  #12125] (Federico).

* Fixed stupid bug in the ICO loader.  ICO pixbufs should always have
  an alpha channel [Ximian bug #11224].  (Federico)

* Slight tweaks to the documentation Makefile.  (Federico)

* Added support for 16-bpp BMPs and ICOs (Federico).

* Added support for 32-bpp ICOs (Federico).

* Use the correct visual and colormap for the pixbuf-demo widgets

* Install the headers in a versioned directory so that they don't
  collide with the GNOME 2 platform (Havoc).
2002-05-11 11:56:58 +00:00
fredb
b27c649ace Remove reduntant setting of PKGREVISION. 2002-03-15 00:46:02 +00:00
fredb
b48eba1112 Give all packages which depend on "png" a version bump, and update
all dependencies on packages depending on "png" which contain shared
libraries, all for the (imminent) update to the "png" package.
[List courtesy of John Darrow, courtesy of "bulk-build".]
2002-03-13 17:36:35 +00:00
jlam
5f728effb1 Change the way in which the autotools are invoked to match the example in
Packages.txt.  This seems to prevent a recompilation of most of the
libraries during the installation phase.
2002-02-27 07:13:16 +00:00
jlam
c6de8269af * We use automake, so we must patch configure.in, not configure.
* Fix the path to the rgb.txt file, which wasn't being set properly due
  to x11-links.
2002-02-27 06:41:05 +00:00
skrll
08bdd44549 mkdir -> ${MKDIR}
rmdir -> ${RMDIR}
rm -> ${RM} (${RM} added to PLIST_SUBST)
chmod -> ${CHMOD}
chown -> ${CHOWN}
2002-02-15 10:12:28 +00:00