Commit graph

278 commits

Author SHA1 Message Date
jlam
462086f7c0 Typo. 2002-11-26 08:33:18 +00:00
jlam
ad3034ce59 Use "cp" instead of "pax" to copy the directory trees. 2002-11-26 06:53:57 +00:00
jlam
103aee9d25 Move the _REQUIRE_* definitions from xfree.buildlink2.mk to the x11-links
Makefile so that they won't be defined for other packages that include
xfree.buildlink2.mk.
2002-10-08 09:23:17 +00:00
jlam
e6da791d8a Remove reference to x11.buildlink.mk. 2002-10-08 08:04:23 +00:00
jlam
84cb9a37e9 Create a new variable USE_X11_LINKS that controls whether packages that
use buildlink2 and set USE_X11 will use x11-links, or if they will simply
symlink the X11 files directly into ${BUILDLINK_DIR}.  If USE_X11_LINKS is
"YES" (the default), then x11-links is used.  If USE_X11_LINKS is "NO",
then the X11 files are symlinked directly.

There is a choice here between speed and flexibility.  Using x11-links is
faster since you don't need to spend time symlinking all of the X11 files
into ${BUILDLINK_DIR}.  However, if you update your X11 installation, then
the x11-links package will likely be out-of-date.  Conversely, directly
symlinking the X11 files will protect you from changes in your X11
installation when you update, but there is a (small) time penalty to have
to do it for every package that uses X11.
2002-09-27 09:22:58 +00:00
jlam
d21436270c Fix comment to note that you'll need to update the x11-links dependency in
bsd.buildlink2.mk as well.
2002-09-20 23:53:32 +00:00
jlam
faf92a14fa Actually define USE_BUILDLINK2 so that we can use the buildlink2.mk files. 2002-08-26 06:28:42 +00:00
jlam
d788337653 Add missing BUILDLINK_PACKAGES lines. 2002-08-26 06:28:21 +00:00
jlam
4e4ac81896 Remove private buildlink.mk files that were only used by x11-links. They
are no longer necessary now that x11-links uses buildlink2.
2002-08-26 06:18:00 +00:00
jlam
54b8c01927 Revert previous change now that the buildlink2.mk files have hit the main
trunk.  These packages can now safely use buildlink2.mk files.
2002-08-25 19:43:33 +00:00
abs
e8063b068e revert buildlink2.mk merge until Johnny has a chance to look at the issues 2002-08-23 14:27:14 +00:00
jlam
b96524abd4 Merge pkgsrc/pkgtools from the buildlink2 branch back to the main trunk. 2002-08-23 05:22:54 +00:00
jlam
dc00762da0 Separate out the OpenWindows buildlink logic and XFree buildlink logic
into separate files for cleanliness.
2002-08-05 04:57:01 +00:00
jlam
1dcac4b18d Update pkgtool/x11-links to version 0.8:
Use _REQUIRE_BUILTIN_* to specify that the headers/libraries of some parts
of X11 that are available from 3rd parties must be part of the standard X11
distribution or else their symlinks aren't installed as part of x11-links.
This is to allow x11-links to contain all of the parts of the standard X11
distribution.

The problem that prompted this is that newer releases of XFree86-4.x
contain not just new libraries but new inter-library dependencies.  Some
of the X11 libraries present in XF86-4.x that were also in XF86-3.x now
depend on libXpm.so or libfreetype.so, which, from a buildlink
point-of-view, must also be found during the link phase when building
software.
2002-06-26 05:46:23 +00:00
veego
4e4180b888 Update to 0.7, which is needed for xfree-current (4.2.99.1).
Added:
include/X11/Xft/XftCompat.h
include/X11/extensions/XRes.h
include/X11/extensions/XResproto.h
include/fontconfig/fcfreetype.h
include/fontconfig/fcprivate.h
include/fontconfig/fontconfig.h
lib/libXRes.a
lib/libXft.so.2
lib/libXft.so.2.0
lib/libfontconfig
lib/libfontconfig.so
lib/libfontconfig.so.1
lib/libfontconfig.so.1.0
2002-04-14 19:05:56 +00:00
markd
faef9da317 Add XFree86 4.2.0 additions, bump version to 0.6:
include/X11/fonts/fontenc.h
include/X11/extensions/xtrapbits.h
include/X11/extensions/xtrapddmi.h
include/X11/extensions/xtrapdi.h
include/X11/extensions/xtrapemacros.h
include/X11/extensions/xtraplib.h
include/X11/extensions/xtraplibp.h
include/X11/extensions/xtrapproto.h
lib/libXrender.so.1.1
lib/libXTrap.a
lib/libXTrap.so
lib/libXTrap.so.6
lib/libXTrap.so.6.4
lib/libXinerama.so
lib/libXinerama.so.1
lib/libXinerama.so.1.0

OKed by jlam
2002-01-27 10:32:30 +00:00
abs
318556c7ff If we are missing ${X11BASE}/include/X11/X.h, we're not going far 2002-01-01 18:32:51 +00:00
jlam
0be55d3f0b Add a guard to prevent packages other than x11-links from using the
x11-links/buildlink.mk file.
2001-12-21 16:22:53 +00:00
tron
3cbb826755 Make this package work under Solaris (only tested with Solaris 9). 2001-12-17 09:38:07 +00:00
kristerw
5c4ee60898 Added missing library lib/libXmu.so.6.0 and bump the package version to 0.5.
OK:ed by jlam.
2001-12-08 23:15:36 +00:00
zuntum
273821c4d3 Move pkg/ files into package's toplevel directory 2001-10-31 20:59:00 +00:00
jlam
90b09dbbba Add note pointing out that the x11-links dependency in x11.buildlink.mk
should also be updated when this package is.
2001-10-09 15:30:23 +00:00
jlam
83e45e59dd Add comment noting what should be listed under BUILDLINK_FILES. 2001-10-09 07:07:25 +00:00
veego
5e7e2e702b Bump to 0.4, XFree86 4.1.99.1 has some new files:
include/X11/extensions/XLbx.h
include/X11/extensions/Xrandr.h
include/X11/extensions/randr.h
include/X11/extensions/randrproto.h
lib/libXfont.so.1.4
lib/libXft.so.1.1
lib/libXrandr.a
lib/libXrandr.so
lib/libXrandr.so.1
lib/libXrandr.so.1.0
lib/libXvMC.a
lib/libfontenc.a
2001-10-07 20:16:43 +00:00
jlam
a155df85ab Update pkgtools/x11-links to 0.3. Changes from version 0.2 are adding
a missing shared library from XFree86-3.3.x (libXext.so.6.3).
2001-09-25 23:47:30 +00:00
jlam
91ff1a94c3 Add missing shared library from XFree86-3.3.x (libXext.so.6.3), noted by
Thomas-Peter Klug <thomas-peter.klug@db.com> on port-amiga.
2001-09-25 23:36:49 +00:00
agc
a16fc84f19 Deprecate NO_WRKSUBDIR, replacing it with an explicit assignment of:
WRKSRC= ${WRKDIR}

This is much cleaner, much more indicative of what happens, and removes
another of the negative definitions (NO_.* = value).
2001-09-09 20:36:07 +00:00
jlam
2cffc55c8f x11-links creates a shadow directory of symbolic links for X11 headers and
libraries to ${X11BASE} under ${LOCALBASE}/share/x11-links.  It is intended
for use by buildlink code to cleanly separate out the true X11 code files
from any installed X11 package code files.  The X11 hierarchies supported
are:
	XFree86-3.3.x
	XFree86-4.0.x
	XFree86-4.1.0
2001-08-29 22:24:49 +00:00