Commit graph

41 commits

Author SHA1 Message Date
wiz
d68ad72d83 Unbreak build.
(hi rillig! changing DISTNAME changes WRKSRC)
2005-10-04 12:24:08 +00:00
rillig
483854905f Fixed pkglint warnings. 2005-09-28 13:54:49 +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
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
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
agc
4a3d2f7ce2 Add RMD160 digests. 2005-02-23 22:24:08 +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
snj
da696e032c Convert to buildlink3. 2004-04-22 04:02:46 +00:00
grant
f49bdea710 replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-22 08:24:28 +00:00
grant
4e01d0babf add USE_PKGLOCALEDIR. 2003-09-27 15:29:47 +00:00
grant
4083b24390 s/netbsd.org/NetBSD.org/ 2003-07-17 21:31:04 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +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
salo
937b3bf13b USE_PKGLOCALEDIR, remove unnecessary patches, delint. 2002-11-30 23:21:32 +00:00
jlam
b75f23ac2f buildlink1 -> buildlink2 2002-09-21 10:57:08 +00:00
fredb
4279c00079 Update maketool to version 0.7. Lots and lots of bug fixes. I couldn't get
it to freeze or crash at all. Notable new features:

- - "maketool" now understands how to run "autoconf", "automake"..., and
     even "xmkmf" for packages based on "imake"!

- - Add "mo" catalogs for Japanese and Czech.
2002-03-10 01:16:29 +00:00
tron
f705015de1 Never try to remove directories in "share/locale" because they are used
by several packages.
2002-01-10 21:12:06 +00:00
zuntum
c72c1cf5f9 Move pkg/ files into package's toplevel directory 2001-11-01 00:57:41 +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
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
fredb
487dc07506 Update my email address. 2001-07-13 14:41:19 +00:00
jlam
3b65bde2f7 USE_CONFIG_WRAPPER is automatically set if USE_BUILDLINK_ONLY is defined,
so remove it from package Makefiles.  Also move the inclusion of the
buildlink.mk files to the end of the Makefile to just before bsd.pkg.mk
to ensure that any Makefile settings occur before the buildlink.mk files.
2001-06-29 04:54:49 +00:00
zuntum
94af29f3b5 o converted to use buildlink.mk 2001-06-26 14:01:53 +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
dfb2d5edc6 Move to sha1 digests, and/or add distfile sizes. 2001-04-21 00:44:09 +00:00
agc
d7d36b3561 + move the distfile digest/checksum value from files/md5 to distinfo
+ move the patch digest/checksum values from files/patch-sum to distinfo
2001-04-17 10:57:56 +00:00
wiz
d480fe70ce Move BUILD_USES_MSGFMT in DEPENDS block, mostly by removing empty
lines.
2001-04-02 20:06:11 +00:00
hubertf
e32afb6fea Change BUILD_DEPENDS semantics:
first component is now a package name+version/pattern, no more
executable/patchname/whatnot.

While there, introduce BUILD_USES_MSGFMT as shorthand to pull in
devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current).

Patch by Alistair Crooks <agc@netbsd.org>
2001-03-27 03:19:43 +00:00
wiz
94dc65fbec Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-16 14:38:16 +00:00
wiz
7e958240a3 Fix gettext dependency, USE_LIBINTL, and reduce patch by libintl workaround. 2000-12-31 14:00:09 +00:00
fredb
d5499e37e7 Update "maketool" to 0.6.1. Changes since 0.5.1:
0.6.1 (19 Jul 2000)

     * Fixed bug with glib 1.2.7 and the glib 1.2.6-7 in RH 6.2.

0.6 (13 Jul 2000)

     * Initial  implementation  of  printing  the  make  log. Prints to
       PostScript. Preferences entries exist (e.g. paper size, margins)
       but  there  is  no GUI for them yet. Reads list of printers from
       /etc/printcap or lpstat -c` (decided at configure time).
     * Initial  implementation  of  a  Find window. Still several rough
       edges.  Can enter a literal or a regexp, and find or find-again.
       Stack  of  historical search cases, navigable with PgUp/PgDn. No
       case-insensitive literals yet.
     * Implemented  a  File->Change  Directory  command,  and a menu of
       previous  directories.  Shows  basename  of current directory in
       main window title bar.
     * Dialogs  are  properly  marked  as  transient so that the window
       manager handles them correctly.
     * Dialogs  are  positioned over the main window instead of letting
       the window manager choose a random and inconvenient position.
     * Rewrote the process spawning code. This made the code a lot more
       orthogonal  and  also  fixed  a  bug whereby the Stop button was
       broken.
     * Tooltip  for  Again toolbar button, and the Again menu item, now
       mention what the last target is. This avoids nasty surprises.
     * Implemented Edit->Copy command which copies the selected line to
       the clipboard.
     * Added filter support for the MWOS xcc cross-compiler.
     * Added filter support for bison.
     * Added filter support for flex.
     * Dependencies are built using makedepend rather than hardcoded.
     * Can   now   build   debugging  version  using  DEBUG=n  on  make
       commandline.
     * Solaris debugging & Purifying patches for Makefile.
     * NetBSD port makefile fixes.
     * configure checks for filio.h> for Solaris.
     * Worked  around incompatibility with GDK/GTK 1.2.6. I still don't
       know  why  this change actually matters, and I still think its a
       GDK  or  GLIB  bug,  but  for  the  time being this change fixes
       maketool. This obsoletes the gtk-1.2.6 patch.
     * Fixed  bug  introduced  in  the  gtk-1.2.6  patch which lost the
       output  of  gmake  --version  when building the Help->About make
       dialog.
     * Fixed   bug  where  an  error  message  specifying  an  absolute
       pathname,  when  found  in  a  recursive  make,  would result in
       maketool   attempting   to   edit  sub_dir/abs_path  instead  of
       abs_path.
     * Fixed  bug  which caused coredump when pressing Clear Log during
       build -- by greying out the Clear Log item.
     * Fixed alignment of labels in Preferences window.
     * Fixed a few minor warnings -Wall found.
     * Fixed  bug which caused menu item greying to be done prematurely
       when child make processes were started.
2000-08-11 18:47:40 +00:00
jlam
d0d079e75e The gettext package gained a shared library. For all packages which
link against libintl.so, update the dependency on gettext to >=0.10.35nb1.
2000-07-31 04:14:04 +00:00
hubertf
3bbeeaa440 be consistent on which version to wildcard 2000-01-10 19:11:07 +00:00
abs
df05aef71f Strip trailing '.', and/or leading '(a|an) ' 2000-01-05 15:37:50 +00:00
fredb
aab4587f48 Update maketool to 0.5.1. Incorporates pkgsrc patches,
fixes some long-standing bugs, works now with gtk-1.2.6.
2000-01-03 23:36:17 +00:00
tron
fd8f256cc5 Use wildcard dependence for "gtk+" package. 1999-10-23 00:05:15 +00:00
fredb
98351f7423 Set 'GMAKE' in CONFIGURE_ENV 1999-10-13 12:32:05 +00:00
fredb
0c01e54c61 Update maketool to 0.4. Bug fixes, new color prefs, more. See CHANGLOG.
Replaced some goofy sed stuff (make -> gmake) with proper patches
to configure.in and configure.
1999-10-13 11:31:26 +00:00
agc
780c8b5318 Make this package compile on Solaris, FWIW. 1999-10-06 13:07:02 +00:00
fredb
32c1b2177c Initial import of maketool-0.3, a graphical front end to GNU make. 1999-09-17 14:40:45 +00:00