Commit graph

112 commits

Author SHA1 Message Date
jlam
60f791e1e6 Move the check-shlibs target from bsd.pkg.mk to bsd.pkg.check.mk where
it will live with other "check" targets run after package installation.

Get rid of SHLIB_HANDLING, whose meaning had mutated over the years
from one thing to another.  Currently, it is used to basically note
whether the system's "ldd" command can be usefully run on the package's
binaries and libraries.  Rename this variable to CHECK_SHLIBS_SUPPORTED
for more clarity.

CHECK_SHLIBS is now a variable set exclusively by the user in /etc/mk.conf
to note whether the check for missing run-time search paths is performed
after a package is installed.  It defaults to "no" unless PKG_DEVELOPER
is set.
2006-05-22 22:22:02 +00:00
reed
b3c1423e9c Add xfree.randrproto and xfree.renderproto files.
It doesn't like this would ever be needed currently.
The native XFree86 shipped with NetBSD has versions of
randr and render headers that are too old so pkgsrc will
force use of pkgsrc versions instead. (And anyways, the default
PREFER_PKGSRC choosed pkgsrc versions too.)

Also, these files are used for native X.org.

I will just ride on same version from a little earlier.
2006-04-19 17:03:28 +00:00
reed
3667118593 Add xorg.compositeproto, xorg.xextproto and xorg.fixesproto files.
Bump version to 0.30.
2006-04-19 15:56:38 +00:00
reed
540342c31e Add another libXaw and libXt entry.
This is from Bernd Ernesti (also on pkgsrc-users list)
for upcoming Xfree*^ 4.6.0 release.

Package version was just update a couple minutes ago, so
ride on that version.
2006-04-19 12:33:28 +00:00
reed
4b4390245a Update to change package names that have been changed.
(And add include of xproto buildlink3.mk for x.org.)
Increase package version to 0.29.
2006-04-19 12:30:25 +00:00
rillig
96fc47c14f Aligned the last line of the buildlink3.mk files with the first line, so
that they look nicer.
2006-04-12 10:26:59 +00:00
reed
5abef9be14 Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).
2006-04-06 06:21:32 +00:00
reed
f759d83930 List Xorg versions also.
(I have used Xorg as native X.)
2006-03-31 01:05:16 +00:00
dmcmahill
91649a67c0 avoid a malformed conditional with the make on netbsd-2. 2006-03-23 13:46:31 +00:00
reed
6491d05a69 Add include/X11/XlibConf.h to xorg list. I noticed and added that
a few weeks ago when I was doing some builds using modular-xorg.
(Now that new Xorg is in, maybe there are some others to add?)

Update version.
2006-01-19 01:05:24 +00:00
christos
cd18fc91dc Use ${ABI} for library files, patterned after what SGI does. This makes
X11 packages work on amd64 linux boxes. From Benjamin Shi.
2006-01-10 16:56:42 +00:00
jlam
2558c0291d Change my MAINTAINER email address to the one I've been using for
pkgsrc work.
2005-12-17 05:20:21 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
seb
f01e6ca40e x11/render package had been moved as x11/renderext. 2005-10-16 08:57:30 +00:00
reed
1014a5d2a8 Add xorg file which has common Xorg file entries.
Forgot in commit a few moments ago.

This was discussed on tech-pkg on July 7.
2005-07-25 20:54:00 +00:00
reed
1a9fbfd351 Added xorg support, based on if ${X11BASE}/lib/X11/config/xorgversion.def
exists. Added new files for the xorg related files.

Version is now x11-links-0.26.
2005-07-25 20:50:25 +00:00
jlam
5626c2a62f Update pkgtools/x11-links to 0.25. Changes from verison 0.24 include
synchronizing with the files listed in src/distrib/sets/lists/x* for
XFree86 4.5.0.
2005-06-10 03:44:07 +00:00
jlam
c65b1c3e4b Change the way the PLIST is generated. We now use a separate loop after
the files in the work directory are built to discover the directories
that need to be removed at deinstall time.  This fixes PR pkg/25325 by
Georg Schwarz.
2005-06-06 09:05:25 +00:00
jlam
be22067560 Fix the permissions on the directories installed by the x11-links
package in case the build user's umask is too strict.  This change is
mostly from the patch in PR pkg/29256 by Ian Leroux.
2005-06-06 08:42:53 +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
wiz
2392e577cd Refer doc/pkgsrc.html instead of Packages.txt (HOMEPAGE variable). 2005-05-07 22:24:04 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
jschauma
94c59e608d On IRIX, only link in ABI specific files to avoid conflicts lateron 2005-03-07 04:03:09 +00:00
wiz
8a95eb4505 Instead of disabling the randrext and Xrandr packages on systems
which have no extutil.h header file, just make them depend on the
xextensions package which provides it.
Bump PKGREVISION for Xrandr and randrext.
Add builtin.mk file for xextensions.

jlam says ok.
2005-03-05 18:16:21 +00:00
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