Commit graph

92 commits

Author SHA1 Message Date
wiz
adc1bb3c9d Unused. 2004-05-22 10:04:21 +00:00
grant
13b25ab489 drop the minimum required version of built-in xpm to 3.4. this is
actually still more strict than the buildlink2 behaviour (which would
allow any version), but at least packages requiring xpm can now build
again with builtin xpm on non-XFree86 platforms.
2004-05-20 11:25:57 +00:00
grant
e47d4b1658 clean up, do away with lots of blank lines, |fmt 70 75. 2004-05-15 06:06:15 +00:00
grant
f93be2da98 use PKGBASE instead of PKGNAME if we detect builtin xpm. 2004-05-15 06:03:11 +00:00
snj
609425c2ed Set BUILDLINK_PREFIX.xpm to ${X11BASE} if we're using builtin xpm.
Closes PR pkg/25302.
2004-04-24 21:20:56 +00:00
minskim
ba6619e087 Enable pkgviews installation. 2004-04-22 23:52:19 +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
326169077a USE_BUILDLINK3 must be set to "yes" or "no", not defined/undefined. 2004-03-23 04:40:59 +00:00
jlam
964efcc465 Catch up with removal of BUILDLINK_{IS,USE}_BUILTIN. 2004-03-10 18:35:32 +00:00
jlam
d0b4c54eb6 Split out the code that deals with checking whether the software is
built-in or not into a separate builtin.mk file.  The code to deal
checking for built-in software is much simpler to deal with in pkgsrc.

The buildlink3.mk file for a package will be of the usual format
regardless of the package, which makes it simpler for packagers to
update a package.

The builtin.mk file for a package must define a single yes/no variable
USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.
2004-03-10 17:57:14 +00:00
jlam
7699290f10 If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.
2004-02-06 19:04:24 +00:00
jlam
01a5abff01 Support BUILDLINK_DEPENDS.<pkg> being a list of values. 2004-01-24 03:12:31 +00:00
jlam
f696a7b283 Using xpm implies using X11. 2004-01-24 01:51:07 +00:00
jlam
3afdeb510f On IRIX systems, assume that Xpm is built-in. 2004-01-21 11:24:38 +00:00
jlam
9850029667 Remove comment I accidentally left in this file during bl3ification that
enabled me to test this on a NetBSD system.
2004-01-21 11:18:44 +00:00
jlam
6ff48e076b bl3ify 2004-01-05 11:53:39 +00:00
jlam
d279e6f535 Use S/+$// instead of C/\+$// to save a backslash. Very highly
recommended by seb :)
2004-01-05 11:05:44 +00:00
jlam
c9ff27d270 Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables. 2004-01-05 09:31:31 +00:00
jlam
47bb2aae5f Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk. 2004-01-04 23:34:04 +00:00
jlam
57635c2e5d Match the buildlink3.mk guidelines set out in revision 1.22 of
bsd.buildlink3.mk.
2003-09-30 10:18:57 +00:00
jlam
f339438669 Conform to latest buildlink3.mk guidelines using *_BUILDLINK3_MK guards
to protect more parts of buildlink3.mk files against multiple inclusion.
2003-09-30 00:42:32 +00:00
jlam
aaa25bfe59 Rewrite buildlink3.mk files to match the updated buildlink3.mk template
in bsd.buildlink3.mk: the *_BUILDLINK3_MK multiple inclusion guards are
removed and we ensure that things that should be defined only once really
are defined only once by using section-specific or variable-specific
guards.
2003-09-28 12:54:52 +00:00
jlam
0aa210c78e Provide definitions for BUILDLINK_PREFIX.<pkg> when the dependency may be
satisfied by a base system (X11R6) component.
2003-09-14 01:47:51 +00:00
jlam
c74a02ee07 Need to use :C instead of :S to get the "pop" action to work properly. 2003-09-13 23:21:19 +00:00
jlam
440bc402a1 Move BUILDLINK_CHECK_BUILTIN.<pkg> documentation into bsd.buildlink3.mk. 2003-09-05 11:39:02 +00:00
jlam
54f69b4eda Add some buildlink3.mk files needed by x11-links>=0.13. 2003-09-02 07:12:16 +00:00
seb
72c7c9e329 Indent a bit. It's a bit clearer this way, isn't it? 2003-08-11 13:28:08 +00:00
grant
0155927c43 s/netbsd.org/NetBSD.org/ 2003-07-17 21:41:05 +00:00
jschauma
dc33f9f43e IRIX has it's own xpm. 2003-06-12 15:42:04 +00:00
atatat
fe8763ca9f Bump BUILDLINK_DEPENDS.xpm from "xpm-3.4k" to "xpm>=3.4k" so that pkgs
that depend on xpm don't get lost trying to install xpm-3.4knb1 when
xpm-3.4knb1 is already installed (because they think they need
xpm-3.4k because that's what the buildlink file said).

Suggested by the wiz.
2003-03-13 17:36:28 +00:00
jschauma
d8f9938d2c Use new IMAKE_MAN_PATH variables in PLISTs to make these packages more
portable.  Bump PKGREVISION accordingly.
2003-03-02 19:47:23 +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
13c830fe56 Use some indentation to make this easier to read. 2002-11-15 11:32:38 +00:00
bouyer
87300d1c13 This file was removed on rev 1.14. I don't know why cvs re-added it instead
of aborting because of the conflict.
2002-10-28 11:23:08 +00:00
bouyer
7c7c9e7a6f On Solaris, if ${X11BASE} != "/usr/openwin" use the builtin XPM if it exists. 2002-10-27 18:00:07 +00:00
wiz
be560c70ab Unused. 2002-10-10 13:09:57 +00:00
tron
df0b4367aa The "Xpm" library is distributed with Solaris 9. Handle this case like
XFree86 4.x and don't install the package.
2002-09-01 15:13:41 +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
jlam
e54da451c1 Add new private variables _REQUIRE_BUILTIN_* that can be used to specify
that the headers/libraries must be part of the standard X11 distribution or
else they aren't symlinked into ${BUILDLINK_DIR}.  These are meant to be
used only by x11-links, and is to allow x11-links to contain all of the
parts of the standard X11 distribution.
2002-06-26 05:40:33 +00:00
agc
cf8f2160d8 Revert previous change - Martin already made a much cleaner fix for this. 2002-05-24 14:57:31 +00:00
agc
88e2784beb Apply fix from Lloyd Parkes <lloyd@must-have-coffee.gen.nz> in PR
16421 which recognises properly that sparc64 is a 64-bit architecture.
2002-05-24 13:32:41 +00:00
martin
239936a17f Add a missing include, so all 64bit archs are recognized correctly.
Closes PR 16421 by Lloyd Parkes.
2002-05-12 22:38:38 +00:00
fredb
5e3a7fb447 The man pages haven't been compressed by default on NetBSD for a long time. 2002-04-14 23:34:40 +00:00
zuntum
d038a73ebd Move pkg/ files into package's toplevel directory 2001-10-31 22:52:58 +00:00
wiz
1c3e1f954c Update MASTER_SITES, inspired by pkg/13828 by Kevin Lo. 2001-08-30 11:11:24 +00:00
jlam
73d2f0ca37 Packages that USE_IMAKE shouldn't set USE_BUILDLINK_ONLY, as they don't
satisfy the condition of being "strongly-buildlinked" (see
http://mail-index.netbsd.org/tech-pkg/2001/08/20/0005.html for the
definition).  This is in response to the recent change to bsd.pkg.mk to
not use buildlink-x11.
2001-08-22 17:38:56 +00:00
jlam
3b682b6b3a Mark as USE_BUILDLINK_ONLY. 2001-08-08 07:15:03 +00:00
jlam
d2eb68d2a6 Add dir_DEFAULT setting used by EVAL_PREFIX logic to set the default
installation directory in case the package isn't installed.
2001-07-27 13:33:18 +00:00
jlam
7b1d3cb465 Mechanical changes to buildlink.mk files to use EVAL_PREFIX to set
BUILDLINK_PREFIX.<pkgname>.  This allows buildlink to find X11BASE packages
regardless of whether they were installed before or after xpkgwedge was
installed.  Idea by Alistair Crooks <agc@pkgsrc.org>.
2001-07-20 01:54:31 +00:00
tron
796d536a10 Fix typo in last commit. 2001-07-07 06:24:12 +00:00