Commit graph

238 commits

Author SHA1 Message Date
grant
e52a4d26ee turn off shlib dependency checking for openwin, which can have X shared
libraries dependencies missing from a "normal" installation.
2005-02-20 07:48:48 +00:00
grant
8c5915c9d8 add support for OSF1, from by Tobias Nygren. 2004-11-20 06:34:26 +00:00
sketch
98543b64e0 Update comment to reflect reality regarding bumping buildlink3 depends. 2004-11-11 18:17:52 +00:00
sketch
bb84fbf730 Require x11-links-0.24 for the fixed OpenWindows headers. 2004-11-11 18:17:07 +00:00
sketch
062cdc890a Bump package version rather than PKGREVISION as this is software we maintain
ourselves.
2004-11-11 18:04:42 +00:00
sketch
d6df3b1fa5 Fix checks for __STDC__ in older versions of OpenWindows headers so that the
SunPro compiler gets the correct syntax for macro concatenation.

Bump PKGREVISION.
2004-11-11 17:44:39 +00:00
jlam
96580e486b CREATE_X11LINK is used to generate the symlinks in the work directory
corresponding to the X11 files.  This can be defined to be more complex
script than the default of "${LN} -fs $$src $$dest" if some of the files
need to have transformations performed on them.
2004-11-11 15:51:14 +00:00
reed
ccd22e151d Improved DESCRiption (as discussed with maintainer). 2004-10-01 03:00:47 +00:00
grant
9d4a06c7ba handle X.org 6.7 and treat it the same way as XFree86 4.4 for the
moment.
2004-07-24 07:00:39 +00:00
heinz
23c1021c80 Use option "-r" instead of "-e" for ${TEST} since this is not portable to some
operating systems (eg UnixWare).
2004-05-15 13:57:12 +00:00
jlam
88588c9c0b Use "XF86_VERSION" instead of "_XF86_VERSION" as the variable name since
we use it in several places within pkgsrc as a public variable.
2004-03-30 17:04:06 +00:00
jlam
6d92080aa2 Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
2004-03-29 05:43:28 +00:00
jlam
e6bfd3c6c2 Force all of the headers and libraries to be symlinked into
${BUILDLINK_X11_DIR}, even in the "pkgviews" case.  This makes building
X11 packages work with pkgviews again after the X11_TYPE-related changes.
2004-03-17 06:01:17 +00:00
recht
b4268706cf Xrandr won't build without the X Extension library which is only present
in XFree86>=4.3; ignore it when checking dependencies or buildlinking.
Skip also randrext (Xrandr's header files) in this case.

The patch agains x11-links' builtin.mk is a slightly modified version of
the patch jlam@ posted in:
http://mail-index.netbsd.org/tech-pkg/2004/03/15/0001.html

ok'd by jlam@
2004-03-15 17:30:18 +00:00
tron
de6e90ca8f Fix recursive variable assignment. 2004-03-15 10:35:13 +00:00
jlam
cbf4f170bc builtin.mk file to hold information about the built-in X11R6
implementation.
2004-03-15 01:07:59 +00:00
jlam
0190c06a95 Garbage collect USE_X11_LINKS, which was used solely to avoid
dependency loops, and which are now handled in a more general way
by bsd.buildlink3.mk.
2004-03-11 05:16:49 +00:00
jlam
d62c2888d0 Add a buildlink3.mk file for pkgtools/x11-links. This isn't meant to be
included manually by a package, but is intended for inclusion by
bsd.buildlink3.mk.  It will be used to avoid special-casing x11-links
when creating symlinks into the buildlink directory.
2004-03-11 00:50:14 +00:00
jlam
05cce146f3 Don't cat nonexistent files during the build. 2004-03-11 00:47:01 +00:00
jlam
964efcc465 Catch up with removal of BUILDLINK_{IS,USE}_BUILTIN. 2004-03-10 18:35:32 +00:00
jlam
b199b7e4d3 Update to x11-links-0.23: catch up with Xft2/buildlink3.mk changes. 2004-02-17 16:50:26 +00:00
jlam
c7ee88eb6d Update pkgtools/x11-links to 0.22. Changes from version 0.21 include
handling the built-in expat libraries and headers.
2004-02-17 08:26:25 +00:00
jlam
b4a03adcb9 Update pkgtools/x11-links to 0.21. Changes from version 0.20 include
catching up to changes to xcursor, Xrender, render, Xrandr, and randrext
by including their buildlink3.mk files.
2004-02-16 23:39:36 +00:00
jlam
23e22dc805 This package uses no compilers. 2004-02-10 23:00:05 +00:00
abs
f7ed72c42e Remove 'USE_LANGUAGES=' as at least on my system 'make install' compiles up
something to check the shared library type.
(An entertaining way to pick up on issues seems to be to set CFLAGS to include
an argument not understood by the base compiler, such as '-march=pentium3')
2004-02-03 12:44:20 +00:00
jlam
8fb6f3f443 These packages don't use any compilers, so set USE_LANGUAGES to an empty
value.
2004-02-02 10:08:43 +00:00
recht
d04d6737d8 Add missing extensions/extutil.h and bump version to 0.20.
This fixes the build of Xrandr.
ok'ed by wiz@
2004-01-31 21:58:52 +00:00
xtraeme
1d202088d2 Revert previous commit, it didn't work for binary packages. Noted by
Julio Merino.
2004-01-26 10:10:56 +00:00
xtraeme
8c9cfcd48d Add dependency on XFree86-libs if ${X11BASE}/include/X11/X.h doesn't
exists and we are using XFree86 packages from pkgsrc.
2004-01-25 07:43:54 +00:00
agc
3ad1bdbf06 Move WRKSRC definition away from the first paragraph in a Makefile. 2004-01-20 12:18:15 +00:00
veego
51461ce694 Update for XFree 4.4.0 RC2:
Added shared libraries for libGLw and a different location for ft2build.h.

Version bumped to 0.19.
2003-12-19 19:19:15 +00:00
tron
d2716ca53f XFree86 4.3.0 and above have "libXrender.so.1.2". Problem pointed on by
Bernd Ernesti.
2003-10-20 16:11:16 +00:00
grant
9ff28ef7ff s/${X11BASE}/$${X11BASE}/ in COMMENT 2003-10-19 06:28:08 +00:00
tron
9df403713b Adapt to latest shared library changes in NetBSD's X11 sources and
XFree86-current.
2003-10-18 18:23:03 +00:00
veego
4d271b3397 Update pkgtools/x11-links to 0.16.
Changes include supporting XFree86-4.3.99.14 aka XFree86-current.
Added some new library versions and some freetype2 include files.
And bump the required version number in the bsd.buildlink mk's.
2003-10-13 15:55:11 +00:00
mycroft
09d5e8ff49 Catch up. 2003-10-06 03:00:32 +00:00
jlam
87ce557d03 Document why we include the various buildlink3.mk files. 2003-09-28 12:45:04 +00:00
grant
a3fabf7b04 test's -e operator doesn't work with the sh built-in test on Solaris,
use ${TEST} -e instead.

noted by mlh@goatnospamhill.org on tech-pkg@.
2003-09-19 01:29:00 +00:00
jlam
76fbfed4cf Use pax(1) instead of "cp -R" to install so that we ensure symlinks are
copied instead of followed.
2003-09-09 09:02:30 +00:00
jlam
addc4bd8a7 Update pkgtools/x11-links to 0.14. Changes include supporting
XFree86-4.3.x (or NetBSD-current xsrc) and listing more files for
XFree86 on Darwin.
2003-09-07 21:53:02 +00:00
jlam
86d4fea164 Check that Mesa/GLU is builtin. 2003-09-07 19:40:42 +00:00
jlam
515d606ffb Add back the GLU files and some additional files in XFree86-4.3.x. 2003-09-07 19:30:23 +00:00
seb
94aba904f2 Fix EXTRACT_ONLY. (Johnny please get some sleep :) 2003-09-02 10:41:38 +00:00
jlam
b191d33c41 Update pkgtools/x11-links to 0.13. This package now uses buildlink3
to build.  I'm bumping the version number just in case the installed
package is different from version 0.12 (I can't test on different
systems).
2003-09-02 07:14:39 +00:00
jschauma
aa0aa518ac Finally remove support of Mesa 3.4.1 completely as discussed at length
on tech-pkg@ at various times.  This means that regardless of what kind of
GL support comes with X11, if a package depends on GL, Mesa 5.0.1 (or higher)
will be installed into ${LOCALBASE}.

Some troubleshooting after the latest patches by Krister Walfridsson.
2003-08-26 01:43:48 +00:00
martti
8cee801716 COMMENT should start with a capital letter. 2003-07-21 17:10:16 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
jschauma
89e1b65bc9 Add BUILDLINK_FILES for IRIX64. 2003-06-29 18:32:45 +00:00
jschauma
d9b7f763cf Initial buildlink2 for X under IRIX.
XSgi is based on Release 6 of the X Consortium distribution, but it also
has a whole bunch of symlinks into Motif libraries and headers.

When installing the links, grab the right ABI.
2003-06-12 15:29:52 +00:00
grant
afdebcf9a4 make ${PAX} usage consistent:
- group 'zrw' and 'p' args, -s last
- use the && operator consistently
- strip unneeded parens
- some whitespace cleanup
2003-04-10 01:28:03 +00:00
jmmv
0916498c1b Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz. 2003-03-29 12:40:00 +00:00
heinz
fd27969399 Use PAX instead of CP (Solaris 'cp' cannot copy symlinks) 2003-01-16 21:37:58 +00:00
jlam
3e7b1ad078 Update pkgtools/x11-links to 0.12. Changes from version 0.11 include
teaching x11-links about Xrender libraries and headers via Xrender's
buildlink2.mk.
2003-01-14 09:31:20 +00:00
grant
a15641f873 add .dylib files for Darwin.
This allows X packages to be built on Darwin.

bump pkg version to 0.11.
2003-01-13 09:47:47 +00:00
grant
e367b82852 fix typo: llibXcursor.a. 2003-01-13 09:34:36 +00:00
tron
9b88cf0cee Create a symlink for "lib/libXdpms.a" which is required to build e.g.
"xlockmore" on NetBSD-i386 with XFree86 3.3.6. This fixes PR pkg/19330
by Michael van Elst.
2003-01-03 10:34:39 +00:00
tron
db866bd3f8 Link bitmap files again because they are e.g. need to build the
"enlightenment" package. Bump version number to 0.10.
2003-01-03 10:22:04 +00:00
veego
f5abc8682d Update to 0.8.
Changes:
- Support XFree86 4.2.99.3, so we support the upcoming 4.3
- There is no need to link bitmap files, which was introduced while
  switching to bulidlink2
- Add the following new files:

include/X11/Xcursor/Xcursor.h
include/X11/extensions/bigreqstr.h
include/X11/extensions/extutil.h
include/X11/extensions/mitmiscstr.h
include/X11/extensions/multibufst.h
include/X11/extensions/shapestr.h
include/X11/extensions/shmstr.h
include/X11/extensions/syncstr.h
include/X11/extensions/xcmiscstr.h
include/X11/extensions/xteststr.h
lib/llibXcursor.a
lib/libXcursor.so
lib/libXcursor.so.1
lib/libXcursor.so.1.0
lib/libXrandr.so.2
lib/libXrandr.so.2.0
lib/libXrender.so.1.2
lib/libXv.so
lib/libXv.so.1
lib/libXv.so.1.0
2002-12-27 13:08:24 +00:00
cjep
afa55834c5 Whitespace fix 2002-12-23 16:24:59 +00:00
schmonz
0a1bd5acad Replace IGNORE with PKG_FAIL_REASON or PKG_SKIP_REASON as appropriate. 2002-12-07 02:38:52 +00:00
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