Commit graph

744 commits

Author SHA1 Message Date
fredb
c58c9c8ace Let "FATAL_OBJECT_FMT_SKEW=no" really work. 2000-08-07 10:23:38 +00:00
wiz
b707d51de6 Don't override EXTRACT_CMD if EXTRACT_SUFX is ".zip". 2000-08-07 01:14:08 +00:00
hubertf
8c76c56cd5 forgot one depends -> install-depends rename
Hinted at by wiz
2000-08-06 23:39:23 +00:00
hubertf
71fc302230 Suppress any errors from pkg_delete if no pkgs are installed 2000-08-04 03:24:33 +00:00
hubertf
d4ce86ca24 Fix LTCONFIG_OVERRIDE:
'chmod +x' the newly generated ltconfig file, so it is can be run
2000-08-03 15:45:42 +00:00
dmcmahill
b5e3262f6a minor grammar fix 2000-08-01 21:19:21 +00:00
jlam
f87ba023e8 In LTCONFIG_OVERRIDE code, remove the old ltconfig file before writing
our own in it's place.  This avoids the problem of if the old ltconfig
file is a symbolic link to somewhere else in the filesystem.
2000-08-01 12:00:48 +00:00
hubertf
8926c8c0b2 s/depends/install-depends/ 2000-08-01 02:56:43 +00:00
hubertf
b31a0cbf1e * More target renaming:
depends-list		=> build-depends-list
	package-depends		=> run-depends-list
	print-depends-list	=> print-build-depends-list
	print-package-depends	=> print-run-depends-list

 * While there, fix print-run-depends-list to not seperate items
   by \n.

Changes discussed with wiz.
2000-08-01 02:51:34 +00:00
hubertf
88f32fd5f2 Some more target renaming:
depends		=> install-depends
	run-depends	=> install-run-depends
	build-depends	=> install-build-depends
2000-08-01 02:23:43 +00:00
wiz
3d4a0f3532 Do _not_ pass down NEED_NCURSES in the make flags, or we end up
with a recursive dependency of ncurses on itself on <1.4Y.
Problem found by Dan McMahill.
2000-08-01 02:18:12 +00:00
hubertf
9a6a8bf30a * Remove RUN_DEPENDS (left in packages.7 intentionally)
* Renamed misc-depends to run-depends, and drop (old) run-depends
   altogether

Code reviewed by wiz.
2000-08-01 02:16:58 +00:00
hubertf
ff2aaede36 hand IS_LESSTIF off to MAKEFLAGS, and don't (re)calculate if not necessary 2000-08-01 01:00:16 +00:00
hubertf
b5460eb7a2 expr 0 + 0 returns an error - catch! 2000-08-01 00:47:00 +00:00
hubertf
1d49b935a8 make sure the required packages (depends) are installed before the
package is about to be built. This allows measuring of (only) this
pkg's build cost in some future step.
2000-07-31 22:22:33 +00:00
jlam
f2099aeeca Motif-checking code broke when X11PREFIX == X11BASE and both lesstif and
lesstif12 were installed, and set MOTIFBASE to the wrong value when
USE_MOTIF12 was set.  Fix this by checking for 1.2/2.0 headers when
setting MOTIFBASE.

Also, use just X11PREFIX instead of extra checks for
X11PREFIX == LOCALBASE throughout bsd.pkg.mk.
2000-07-31 02:49:47 +00:00
tron
fdebafe7f5 The "lesstif12" package is in directory "pkgsrc/x11/lesstif12" not
in "pkgsrc/x11/lesstif".
2000-07-30 14:26:11 +00:00
tron
cdcd8eda93 Add new "info" target which calls "pkg_info" for the package in the
current directory.
2000-07-30 08:52:41 +00:00
jlam
628c02c107 Fixup Motif-handling code to work again after X11PREFIX changes.
Also add new USE_MOTIF12 variable to be set by packages requiring the
Motif-1.2 headers/libraries, e.g. www/Mosaic.
2000-07-29 00:06:26 +00:00
wiz
d63de2f4a3 Add USE_CURSES for packages that need curses functionality that only
got added in 1.4Y; on older version of NetBSD, ncurses will be used.
Replace previous code that did the same, but wasn't shared.
2000-07-28 10:33:56 +00:00
hubertf
bfef630bd7 Pull in bulk-build targets if BATCH is set 2000-07-28 01:16:27 +00:00
hubertf
ff3cf6b5cf No need to set PKG_MISC_TARGETS in /etc/mk.conf any more, it's now
on per default in bsd.pkg.subdir.mk
2000-07-28 01:16:04 +00:00
hubertf
d0dc50dff7 Add bulk-package and bulk-install targets so people can invoke these
in pkgsrc or pkgsrc/category now.

The install and package targets are still left in, but deprecated now.
2000-07-28 00:54:06 +00:00
hubertf
ac4380bdd5 initial commit of bulk build targets (more to come) 2000-07-28 00:46:17 +00:00
hubertf
8bf4cd40fb Don't apply ${DIST_SUBDIR} twice.
Fixes PR 10646 by Kawaguti Ginga <k.ginga@nbwww.isc.org ???>.
2000-07-26 12:36:49 +00:00
fredb
6a0010035f When constructing the +BUILD_INFO file, escape ${ECHO} using "make"'s :Q,
rather than enclosing in quotes. Quotes doesn't work very well if the
BUILD_INFO item already has quotes, as is often the case for ${RESTRICTED}.
2000-07-25 16:21:25 +00:00
agc
45ac002b1b Optimise by setting the EVAL_PREFIX names and directories in MAKEFLAGS, so
that they get passed to sub-makes.
2000-07-25 15:15:47 +00:00
jlam
c50ee366cd Add share/doc/html as in NetBSD.pkg.dist. 2000-07-25 12:33:26 +00:00
rh
3a3e3fa910 Let DEPENDS_TARGET default to 'install' not 'reinstall' for 'make update'.
This should fix the brokenness of resumed updates for those who do not set
DEPENDS_TARGET in their /etc/mk.conf.
2000-07-24 20:23:02 +00:00
fredb
80e9a700c5 A license of "no-redistribution" is an oxymoron. Change "no-redistribution"
to "limited-redistribution", which is more correct.
2000-07-23 19:40:17 +00:00
fredb
645854e745 Add 'RESTRICTED' to ${BUILD_DEFS}, so that any restrictions are recorded
in the binary package.
2000-07-23 18:42:48 +00:00
fredb
c4be9e2e76 Document "no-redistribution" license. 2000-07-23 18:36:49 +00:00
rh
5df465172e Make REINSTALL=YES useful for 'make update' by explicitly deinstalling
each package before attempting to install it.  Fixes a problem if
'make clean-update' was called at the wrong time.
Make the 'clean-update' target warn about a preserved ${DDIR} and usage
of 'make update REINSTALL=YES' if necessary.
2000-07-21 06:30:04 +00:00
dmcmahill
cc17206ba3 don't list 'mipsel' as a port name in the README.html's for the packages.
This is consistent with not listing 'm68k'.
2000-07-20 18:13:51 +00:00
rh
19b33bea07 make the update target work with absolute pathnames in ${DDIR} 2000-07-20 17:46:45 +00:00
rh
c2118f4461 Introduce NO_{SRC,BIN}_ON_{FTP,CDROM}. Warn about placing files on CD-ROM
or ftp during 'make package' or 'make mirror-distfiles'.
2000-07-20 12:33:43 +00:00
hubertf
333fc62f64 Use "reinstall" as default for DEPENDS_TARGET, to use any pkg already
built and possible deinstalled as dependency. Addresses PR 10629 by
Erich.T.Enke@wheaton.edu.

(If that's not enough, we can still introduce a "make clean ; make install"-
type target, but for now i'd prefer not to was the cycles)
2000-07-19 22:57:31 +00:00
rh
625e6d6521 Revise previous multi-component-pathname fix: do not depend on the
directory name of a package being the same as the package name when
creating ${DDIR} entries.
2000-07-19 00:08:32 +00:00
rh
a15b9039db Fix clean-update target to remove ${DDIR} if it didn't exist before. This
prevents 'make update' from "resuming" an update that never even began.
Thus, a sequence of

	make clean-update
	make update

is now safe, no matter if 'make update' was started previously or not.
2000-07-18 08:33:49 +00:00
rh
54232daa5b Fix the ${DDIR} target to work with multi-component paths. This makes the
update target work with pkgsrc installations that have more (or less) than
two components (like /src/NetBSD-current/pkgsrc).  Thanks for Matthias
Scheler for noting this!
2000-07-18 08:21:41 +00:00
agc
1430069499 Only look at the first prefix for a package when evaluating the prefix
using EVAL_PREFIX.
2000-07-15 21:36:22 +00:00
agc
78748d628a Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition,
which takes entries of the format <make-definition-name>=<pkgname>. This
has not been added to MAKEFLAGS because (a) premature optimisation is the
root of all evil, and (b) because the .for loop used to implement this
shows the wrong results when multiple prefices are evaluated.

Modify all the package Makefiles to use EVAL_PREFIX, thereby simplifying
them considerably.

ALso simplify the logic to calculate the prefix as well.
2000-07-15 20:39:13 +00:00
tron
a300e69f3c Use "printf("%d", ...)" instead of "print ..." when invoking "awk" in
"print-pkg-size-this" or "print-pkg-size-depends" targets to avoid package
sizes like "2.51887e+09" which "expr" can't handle.
2000-07-14 18:37:05 +00:00
agc
69cbb39071 The previous method of using a make target for finding a prerequisite
package's prefix would not work as part of the environment specification
via MAKE_ENV (as it would not be executed in the correct directory).

Fix this by invoking pkg_info(1) directly, not via an intermediate make(1)
step - this is not as clean, but more effective (i.e. it works).
2000-07-14 16:04:19 +00:00
agc
06a57d66d0 Introduce the mk.conf definition for PRIV_CONF_DIR, which defaults to
${LOCALBASE}/etc, and is the parent directory of the priv package's
user configuration data.

Modify Makefile to pick up this definition, and pass it on as an argument
to the configure script.

Modify the PLIST to include this location, and pre-process the PLIST at
install time to set the correct location.
2000-07-14 12:39:30 +00:00
rh
8410aeda89 Make USE_LIBTOOL depend on libtool-1.3.5nb4 or higher to make sure a C++
compatible version is used.
2000-07-14 06:55:26 +00:00
hubertf
d2131fb905 Remove trailing garbage from RCS Id on first line 2000-07-13 11:40:04 +00:00
agc
4aeac45f89 Make the determination of the pre-req package's installed directory be
a bit more user-friendly.

Introduce a show-{gtk+,imlib,kdebase,qt1,qt2,xpm}-prefix target in
bsd.pkg.mk, and use "${MAKE} show-*-prefix" in package Makefiles.
2000-07-11 14:53:35 +00:00
dmcmahill
255050913a add missing flags to the unzip command 2000-07-07 18:14:39 +00:00
hubertf
8fab5a14eb Add bin-install package: will install a binary package if available,
else run a "make package".

XXX needs to be extended to also look on some FTP sites.
2000-07-06 16:45:21 +00:00