Commit graph

46 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
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
drochner
ffe81e6a2d explicitely buildlink to textproc/expat; otherwise we get a library
dependency on X11's libexpat which causes conflicts later
bump PKGREVISION
2005-04-20 15:42:11 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
jklos
31b1bff351 Bumped PKGREVISION due to change in libwmf. 2005-02-05 18:03:33 +00:00
adam
7b5733f516 Changes 1.0.3:
* A few bug fixes
2005-01-10 16:14:12 +00:00
reed
d809607734 Bump PKGREVISION and bump BUILDLINK_RECOMMENDED.wv.
I saw on one of my boxes:

libwv-1.0.so.2:
        libxml2.so.8 => not found

This was caused because I have wv-1.0.2nb1 which depends on
libxml2>=2.6.2.

libxml2 was later upgraded, but since we don't have recursive dependencies
(which is fine), the old and now missing libxml2 library was still good
enough for wv. (I saw this because I updated libxml2 in place without removing
packages that depend on it
2004-12-24 00:14:45 +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
adam
32f5d61915 Changes 1.0.2:
* Fix iDEFENSE buffer overrun security problem
(thanks to Matthias for heads-up)
2004-09-21 14:45:49 +00:00
wiz
7eedb8777e Convert to buildlink3. 2004-02-15 20:19:00 +00:00
jmmv
ab17dd00b3 PKGCONFIG_OVERRIDE is relative to WRKSRC. 2004-02-14 18:26:26 +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
jmmv
a58dd81611 Bump PKGREVISION due to xmlcatmgr update to 2.0beta1. I know; this is a PITA.
This shouldn't be needed if we had non-recursive dependancies *sigh*.
2004-01-23 21:50:42 +00:00
grant
ef741f8a1a replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-22 07:49:20 +00:00
xtraeme
652ef3e9ff Updated to 1.0.0, Changelog unavailable.
Also update DESCR with reality.
2003-12-13 23:45:12 +00:00
xtraeme
f794de2624 Bump PKGREVISION (libxml2, libxslt and imlib2 were updated). 2003-12-04 19:48:24 +00:00
adam
4c0c7a95a9 Removed ImageMagick dependency, since wv can handle images itself.
Added libxml2 dependendy, because libwmf uses it, and it's needed anyway.
2003-09-23 10:37:56 +00:00
adam
492c0d9e56 Changes 0.7.6: style updates, bidi updates, crasher updates 2003-09-03 13:21:37 +00:00
grant
91f00f1cbc s/netbsd.org/NetBSD.org/ 2003-07-17 21:21:03 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +00:00
jschauma
e366d0c694 Use tech-pkg@ in favor of packages@ as MAINTAINER for orphaned packages.
Should anybody feel like they could be the maintainer for any of thewe packages,
please adjust.
2003-06-02 01:15:31 +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
d8262452c1 Bump PKGREVISION because of dependency on latest freetype2 or glib2
package and library major bumps therein.
Also match dependency in corresponding buildlink2.mk's for the same reason.
Mmmm, binary packages.
2002-12-24 06:09:44 +00:00
wiz
0c955be5c1 Update to 0.7.4. The original unedited release notes:
This is two releases since 0.7.3 took a wrong turn somewhere and
was last seen rummaging in the bins behind NewsForge.net for old
documents. Any information leading to the recovery of the errant
release will be rewarded with a free copy of wv-0.7.4.

As usual I'm clueless about who has contributed what to wv since
the previous release. Martin Junius did a bunch of stuff, again;
Golan a.k.a. 'risk it' and Tian Huisohu found some memory leaks;
Corby Wilson fixed some stuff (hey, even I fixed some stuff :-),
and of course lots of stuff by Dom (internationalization etc.).
2002-11-15 18:03:40 +00:00
wiz
c5934fcdd7 PKGREVISION bump because ImageMagick's buildlink2.mk wants a newer
ImageMagick (different library name).
2002-11-13 19:26:36 +00:00
wiz
a8b8050536 Make sure libwmf is found. Bump PKGREVISION. 2002-11-04 19:20:10 +00:00
wiz
d78faf29bb Update to 0.7.2, changes unknown. 2002-09-11 11:23:14 +00:00
wiz
80ee491886 Since the major of libiconv was increased during the update to 1.8,
bump dependency to latest libiconv version; recursively also bump all
dependencies of packages depending on libiconv.
Requested by fredb.
2002-09-10 16:06:32 +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
taca
0b1146dd66 Update wv to 0.7.0.
Changes from 0.6.7 is here (from http://www.wvWare.com/)

29th October, 2001

Version 0.7.0 of wv is available for download from
SourceForge.

Improvements to LaTeX & HTML output, scripts rewritten
to handle spaces in paths and to allow better image
handling, and various updates.

Special thanks to Will Newton and Michal Jaegermann.
2001-12-10 14:30:14 +00:00
jlam
a4bc16d30c I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use.  Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
2001-10-24 22:10:43 +00:00
jlam
dff59f9ec3 x11.buildlink.mk needs to be included before any buildlink.mk files that
use X11_BUILDLINK_MK as a test value.  Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.
2001-10-23 13:14:43 +00:00
kei
4749a91219 updated wv package to 0.6.7 which is compatible with libwmf-0.2.1. no
functionality changes.
2001-10-15 15:53:15 +00:00
jlam
f79573370a Mechanical changes to 375 files to change dependency patterns of the form
foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.
2001-09-27 23:17:41 +00:00
jlam
63fc151cb9 Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links.  These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
2001-08-29 22:41:00 +00:00
kei
a87b51e639 * updated from 0.6.0 to 0.6.5. There is no changelog in the distributed
archive.  Below is the release note from its WWW page.

  Notes: Lots of minor changes, some minor API
  changes, some bugs fixed, some crashers removed
  Changes: Lots of minor changes, some minor API
  changes, some bugs fixed, some crashers removed

* converted to use buildlink.mk.
2001-07-13 04:49:10 +00:00
jlam
c4e71c5e7a CPPFLAGS is now passed to MAKE_ENV and CONFIGURE_ENV by bsd.pkg.mk, so
adapt by moving CPPFLAGS settings to top-level, and removing explicit
inclusion of CPPFLAGS into MAKE_ENV and CONFIGURE_ENV.
2001-06-11 06:34:17 +00:00
wiz
07cd20b334 Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-16 13:51:27 +00:00
wiz
9e91b0c39c depend on libwmf>=0.1.17nb1 2000-11-16 18:26:09 +00:00
tron
5feac46ad5 Use "${MASTER_SITE_SOURCEFORGE}". 2000-11-11 17:49:22 +00:00
rh
0768898563 Cleanup: remove commented-out parts of the Makefile, remove dependency on
automake
2000-10-17 05:47:19 +00:00
rh
df94b773ce Update wv to 0.6.0. Changes include:
* Changed executable name from wvHtml to wvWare
 * Added Mime display script (wvMime) (Martin Vermeer, Dom)
 * Added Conversion Helper Scripts (wvHtml, wvLatex, wvCleanLatex,
   wvPS, wvDVI, wvPDF) (Dom)
 * Added CleanLaTeX output mode, more closely resembling hand-crafted
   LaTeX (Martin)
 * Use GLib (http://www.gtk.org) (Dom)
 * Use Gnome Libole2 (http://www.gnome.org) (Dom, Jamie)
 * New wvStream architecture (Jamie)
 * Word 2 support! (Martin Vermeer)
 * Code speedups and XP improvements (the Abiword team)
 * Massive work started on an exporter (Dom)
 * Move to wvware.sourceforge.net (Dom)
 * New Maintainer: Dom Lachowicz (cinamod@hotmail.com)
   |-> also getting lots of help from Martin Vermeer
2000-10-16 15:14:22 +00:00
wiz
ece1cc9cde Adapt to ImageMagick API change. Update to 0.5.44, only change (from NEWS
file): Fix summary information bug.
2000-09-02 17:52:53 +00:00
jlam
9980b8edb7 Rework to use libwmf-0.1.17nb1. 2000-08-05 02:39:18 +00:00
wiz
70f0945560 make it run on current/ELF 2000-05-18 00:09:06 +00:00
wiz
8dbb2beadd Initial import of wv, a MS-Word file to HTML/LaTeX converter.
This is the successor of textproc/mswordview, which should be retired
sometime -- at the moment there are still files that are handled better
by it.
2000-02-27 22:09:18 +00:00