Commit Graph

202 Commits

Author SHA1 Message Date
Satoshi Asami 8e7c35dd1a A bunch of new targets in the package area. Relevent targets are:
package:           check installation, build package, create links,
                   touch cookie
repackage:         ditto but don't check cookie
package-noinstall: just build package from installed stuff, no cookies
                   involved at all
package-links      create the symbolic links only
delete-package:    delete package and symbolic links
delete-package-links: delete links only

These should make the management of the spaghetti of package links
a little friendlier. :)
1995-04-30 12:28:43 +00:00
Jordan K. Hubbard 6db578a60b Pass X11BASE to all sub-makes. I need it for a port, and I daresay that
there are a lot of hardwired "/usr/X11R6" paths out there that could stand
to use it as well.
1995-04-28 15:40:37 +00:00
Satoshi Asami 570e661f02 (1) Add the chain of dependencies to the targets in the NO_* section
too (otherwise the chain won't work).
(2) If NO_WRKDIR is set, "make clean" removes "./.*_done" (assuming
    these are cookies...or should I list all the cookies?)
1995-04-24 10:41:51 +00:00
Satoshi Asami c046aaad20 Move call of fake-pkg from do-install to end of install. 1995-04-24 09:05:34 +00:00
Jordan K. Hubbard ffa6d17f61 Ok, this should get the last of the stragglers installed into a new fake-pkg. 1995-04-22 01:22:49 +00:00
Jordan K. Hubbard ca22b5aa87 Don't try to run the fake-pkg target if NO_PACKAGE is set. 1995-04-22 00:08:06 +00:00
Jordan K. Hubbard 405b7c80bd Typo: patch -> package 1995-04-22 00:05:46 +00:00
Jordan K. Hubbard b79219d31a Instead of copying PLIST over, run pkg_create in a special mode that dumps
the fully-formed PLIST to stdout and uses that.
1995-04-22 00:01:26 +00:00
Satoshi Asami 60ee8ee7cb Major overhaul. The major targets (fetch, extract, patch, configure,
build, install) are now all skeletons and do nothing but

(1) Call pre-* target (if exists)
(2) Call scripts/pre-* script (if exists)
(3) Call do-* target
(4) Call post-* target (if exists)
(5) Call scripts/post-* script (if exists)

The do-* targets do all the work.  The pre-* and post-* targets/scripts
don't exist by default.  The main targets check for the cookies too, so
porters shouldn't have to worry about them at all.

NOTE: THE MAIN TARGETS IN THE PORTS MAKEFILES SHOULD GO AWAY.  We need
to fix this before wcarchive comes back up.  Change the names to do-*,
rip out the cookies, rip out the calls to pre-* etc. and most of them
should work.

Also, reorganize the whole thing so that similar targets are together
and add more comments.  Surround section header with 64 #'s (C-u C-u
C-u # in emacs :).

Hopefully this will be the last major change to bsd.port.mk.  Now let
the Makefile-hacking begin.
1995-04-20 18:03:02 +00:00
Jordan K. Hubbard 0892118cdf 1. Add Satoshi's much-requested "fake pkg_add" option to the installation
rule.

2. Have all non-X11 prefix using packages include the BSD.local.dist mtree
   file for initialization of /usr/local.  I'm still not sure if this is
   A Good Thing(tm) but I'll see what the users say.  It's easily overridden.

3. Standardise on ${PKG_DBDIR} as pointer to /var/db/pkg or local preference.
1995-04-19 15:02:26 +00:00
Satoshi Asami f744a9768e Use PKGNAME in the "describe" target (used to generate INDEX) too.
Didn't make sense to have two ports with the same name.
1995-04-18 08:24:18 +00:00
Satoshi Asami 60f1eb26c1 Use PKGNAME instead of DISTNAME in messages. To avoid things like
"Building for WWW" (pops up in two different ports) "Installing for
web2c-6.1" (ditto), which aren even't reminiscent of the port's real
name.

Sorry jmz, please don't go fix the print Makefiles' own messages.
We are going to take them out after we do the great bsd.port.mk
update anyway.
1995-04-18 08:18:27 +00:00
Satoshi Asami 824cc0cc5d "package" now depends on "install", so we can do "make -k package" from
the top level and have the build-package sequence of each port work
together.

For the old behavior (i.e, just go ahead and blindly pack everything up,
regardless of the contents of work/), there is a new target "repackage".
1995-04-17 06:39:05 +00:00
Satoshi Asami 19eddad0a8 "all" now depends on "build", not "extract configure build".
Since "build" depends on "configure", which depends on "patch", etc.,
this shouldn't disrupt any Makefile that doesn't break the dependency
chain.

The old behavior was very annoying because when I did a "make -k",
it would still try to go configure and build even if the extraction
failed.
1995-04-17 06:28:15 +00:00
Satoshi Asami 825402c2ab Yikes...typo (.package/ should have been .packages/). 1995-04-15 23:56:29 +00:00
Jordan K. Hubbard 9e87dd6ab1 Don't pass duplicate pkgdeps to pkg_create 1995-04-10 08:09:21 +00:00
Jordan K. Hubbard a8f0877be0 Add new -P argument to pkg_create. 1995-04-09 15:00:56 +00:00
Jordan K. Hubbard 489c51e631 Add 2 new targets to facilitate some things I'm thinking about.
1.  package-name
	Simply echos the associated package name for a port (if any).
2.  package-depends
	Shows all package names on which this port depends.
1995-04-09 12:27:58 +00:00
Jordan K. Hubbard c4fb365962 1. Fix the first line (should be a proper comment - silly emacs).
2. KEYWORDS+= CATEGORIES
3. CATEGORIES+= all (always want to be in "all"!)
1995-04-09 10:24:09 +00:00
Satoshi Asami 3d0c66c99a Add support for categorized subdirectories for packages. By default,
all .tgz files go to /usr/ports/packages/.packages, and a relative
symlink is created for every item in CATEGORIES...i.e., if "CATEGORIES
= foo bar", then /usr/ports/packages/{foo,bar}/pkgname.tgz both point
to /usr/ports/packages/.packages/pkgname.tgz.

Suggested by:	jkh
1995-04-09 09:59:42 +00:00
Jordan K. Hubbard 30854325fe Add USE_X11 for ports which are X11 users but don't use IMAKE. 1995-04-04 05:57:19 +00:00
Gary Palmer 9a8496fd7b Remove a `.' from the end of the echo line
`>> Attempting to fetch from $${site}' as it is misleading
1995-04-04 04:23:37 +00:00
Jordan K. Hubbard a6ae8257a8 By default, KEYWORDS is a copy of CATEGORIES. 1995-04-01 10:01:49 +00:00
Jordan K. Hubbard c9cf4a47d8 Add default values and document them for CATEGORIES and KEYWORDS. 1995-04-01 09:35:29 +00:00
Jordan K. Hubbard 2cc9ea7aee Add support for new CATEGORIES and KEYWORDS fields. 1995-04-01 09:34:11 +00:00
Satoshi Asami df32d0cc55 Add support for "distributed" patches and a little extra cleanup.
New variables:

PATCH_SITES:	patch equivalent of MASTER_SITES, overridable with
.		MASTER_SITE_OVERRIDE.
PATCHFILES:	Additional files to fetch and give to patch before
.		applying the ones in patches/patch-*.  If name ends
.		with ".gz" or ".Z", it will be piped through zcat first.

Plus PATCH_DIST_STRIP and PATCH_DIST_ARGS that serve the same functions
as PATCH_STRIP and PATCH_ARGS for patches in patches/patch-*.

In the documentation and echo messages, I used the term "distributed
patches" and "FreeBSD patches" to refer to ${PATCHFILES} and patches/patch-*.
If you can come up with better names, by all means go ahead and fix them.

"grep PATCH /usr/ports/*/*/Makefile" reveals seven ports (mule, jless,
jtcl, jtk, dgd, less, color_xterm, gee I wonder why I'm the one who
implemented this) that can benefit from this.  I'm now diving headlong
into /usr/ports to fix their Makefiles.
1995-03-28 01:14:29 +00:00
Satoshi Asami 32c4c80bff Added more standard package suport file names. INSTALL for the
installation script, DEINSTALL for the deinstallation script, and
REQ for the requirement script, will be added with appropriate
flags to PKG_ARGS if they exist under pkg/.
1995-03-27 13:11:18 +00:00
Gary Palmer c534dadbfe Add a misssing `@' from before echo -n "|${MAINTAINER}" 1995-03-23 20:42:42 +00:00
Jordan K. Hubbard 5abc844b74 Add maintainer to the index line. 1995-03-22 21:46:04 +00:00
Jordan K. Hubbard 2d333dc2dd Add new EXTRACT_BEFORE_FLAGS and EXTRACT_AFTER_FLAGS variables to make
complex extraction rules easier.
1995-03-22 21:28:31 +00:00
Jordan K. Hubbard 2efda52f23 Make the fetch message a little more interesting and informative. 1995-03-21 22:43:36 +00:00
Jordan K. Hubbard 3dd8895eb8 Add fetch-list command for Rod
Use ECHO_MSG macro for printing "===>" line things so that I can now turn
those OFF when I don't want them.
1995-03-21 03:59:13 +00:00
Jordan K. Hubbard bc202f1b6e Make the describe rule generate more thorough information that's actually
of use to a front-end program.  Back out my bogus description of the `index'
target! :-)
1995-03-21 01:51:12 +00:00
Jordan K. Hubbard 9608972d54 Document the index target. 1995-03-21 01:31:43 +00:00
Andreas Schulz 261bbea610 Don't do anything if BATCH is specified and the port is interactive for
the package target.The port may is not build and the package fails
otherwise.
1995-03-20 00:41:36 +00:00
Andreas Schulz 0bc6b9462b Change the xmkmf call to a xmkmf -a call. This should be more correct for
all X11R5 and X11R6 ports. This is the way how it should be normally
used according the manuals. Only pre-X1R5 ( X11R4, X11R3) ports can't
handle it.
1995-03-19 12:49:06 +00:00
Jordan K. Hubbard 0722449a9b Back out my previous change. I need to really think about this. 1995-03-03 07:42:10 +00:00
Jordan K. Hubbard 493d75a9d5 A small feature just for my own use. 1995-03-03 06:53:27 +00:00
Jordan K. Hubbard 664b5e14dc Always go to ${WRKDIR} before extraction. Modify the tar extract command
args to take advantage of this.
Pointed-out-by: asami
1995-02-17 08:52:55 +00:00
Gary Palmer 05002e8cb5 Make the checksum target not bomb out if there is a mismatch, just
print a warning. A better fix will come along just as soon as I
work out what it is.
1995-02-14 21:29:28 +00:00
Jeffrey Hsu e687de7a15 Allow arbitrarily named configure script for use w/ HAS_CONFIGURE. 1995-02-06 08:52:19 +00:00
Poul-Henning Kamp 4620f0962b Use absolute path to md5 program. It lives in /sbin and people are unlikely
to have $PATH to it.
1995-02-04 22:56:28 +00:00
Satoshi Asami 94dcffca87 Add long-awaited (:) support for sophisticated dependency checking. We now
have three variables:

EXEC_DEPENDS	- A list of "prog:dir" pairs of other ports this
		  package depends on.  "prog" is the name of an
		  executable.  make will search your $PATH for it and go
		  into "dir" to do a "make all install" if it's not found.
LIB_DEPENDS	- A list of "lib:dir" pairs of other ports this package
		  depends on.  "lib" is the name of a shared library.
		  make will use "ldconfig -r" to search for the
		  library.  Note that lib can be any regular expression,
		  and you need two backslashes in front of dots (.) to
		  supress its special meaning (e.g., use
		  "foo\\.2\\.:${PORTSDIR}/utils/foo" to match "libfoo.2.*").
DEPENDS		- A list of other ports this package depends on being
		  made first.  Use this for things that don't fall into
		  the above two categories.

DEPENDS behaves exactly like before, so old Makefiles will still work
the same.  The two variables are lists of pairs as described above.

For instance, if your program depends on unzip and libjpeg.5.*, use
the following definitions:

EXEC_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS=	jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg

gmake:${PORTSDIR}/utils/gmake is automatically added to EXEC_DEPENDS
if USE_GMAKE is defined.

If NO_DEPENDS is defined, the list will just be printed out one by one.
1995-02-04 05:49:26 +00:00
Gary Palmer cc715f2bca Start the ball rolling by sticking a
MAINTAINER?= line in here.

Idea by: jkh@FreeBSD.ORG
1995-02-01 21:47:57 +00:00
Jordan K. Hubbard 3f4fff96f9 Make fetch a bit more forgiving of subdirs. 1995-01-30 10:06:56 +00:00
Jordan K. Hubbard 825de56725 Fix bogus tab in makesum target. 1995-01-24 02:41:52 +00:00
Jordan K. Hubbard 7b2bb0fb79 Set PREFIX in the build target. Suggested by John Fieber. 1995-01-23 18:22:36 +00:00
Gary Palmer 74d7962900 Oops. Fix up the checksum routine - my last commit broke it slightly. 1995-01-22 20:40:48 +00:00
Andrey A. Chernov 3ece328451 Put brackets around EXTRACT_CMD, can be several commands here 1995-01-17 23:55:53 +00:00
Gary Palmer 2db2081438 Correct a small problem in that when there isn't a checksum for that
particular file, but there is a files/md5, it reports that it failed
the checksum
1995-01-16 23:33:08 +00:00
Andrey A. Chernov 41c4bc57c7 Use absolute path for install passed to configure
to disallow prepending ../ in second level Makefiles
1995-01-12 02:29:42 +00:00
Satoshi Asami fb097df2ce Typo! 1995-01-11 08:53:28 +00:00
Satoshi Asami 1deaf2e347 Add missing ! in front of pipeline for extract commands---otherwise
it would exit on *successful* extraction.
1995-01-11 08:50:48 +00:00
Jordan K. Hubbard 8b9d60735d Catch case where extraction fails. Thanks! 1995-01-10 12:23:44 +00:00
Andrey A. Chernov 10d65ca957 Move pre-extract target inside COOKIE
Add checksum check for extract, if checksum file present
1995-01-06 22:14:12 +00:00
Satoshi Asami d5ca901589 Sort out dependencies. Now they look like:
patch: extract
configure: depends patch
build: configure
install: build

Does this look ok?
1995-01-05 08:15:53 +00:00
Jordan K. Hubbard edf9e79525 Typo fix from Ollivier Robert.
Submitted by:	ollivier
1995-01-05 02:15:05 +00:00
Jordan K. Hubbard e5d85be85c Gary Palmer's patches for checksumming and description.
Submitted by:	gpalmer
1995-01-04 23:06:38 +00:00
Jordan K. Hubbard 2511bc4a15 Put depends before configure. No reason that I can see for putting it after,
and it breaks mule the way it is now.
1995-01-04 09:58:39 +00:00
Jordan K. Hubbard bb3c97bf74 Some of the doc here was less than adequately fleshed-out. Make some
feeble attempt to do so.
1995-01-04 08:30:33 +00:00
Jordan K. Hubbard ad2a7583d6 Document describe target. 1995-01-04 07:35:46 +00:00
Jordan K. Hubbard c723fc3fc8 Add describe target support. 1995-01-03 11:52:01 +00:00
Andrey A. Chernov c9c9b4072b Preset ac_cv_path_CC="${CC}" before running ./configure,
needed for Autoconf 2
1995-01-01 20:06:20 +00:00
Andrey A. Chernov 1974136822 Oops, forget "" for ${CC} and ${CFLAGS}... 1994-12-28 04:17:54 +00:00
Andrey A. Chernov 95f1b49e83 Set proper INSTALL* variables before running ./configure 1994-12-28 04:14:19 +00:00
Andrey A. Chernov af87f3630b Use CFLAGS=${CFLAGS} ./configure to avoid picking dumb GNU -g default 1994-12-28 03:30:21 +00:00
Andrey A. Chernov e887886391 Use "CC=${CC} ./configure" to avoid usage of debugging 'gcc' 1994-12-28 03:21:16 +00:00
Gary Palmer 6d97ec5daa Put dummy targets for make-md5 & check-md5 inside a
NO_EXTRACT ifdef so that tcpblast doesn't muck
things up
1994-12-17 21:29:38 +00:00
Gary Palmer cf6be75886 bsd.port.mk: missing semicolon added
bsd.port.subdir.mk: added check-md5 as target
1994-12-17 20:50:44 +00:00
Andrey A. Chernov 50da78da7c Automatically add gmake to DEPENDS, if USE_GMAKE 1994-12-17 02:37:26 +00:00
Andrey A. Chernov a7e957efb2 Don't use build: ... pre-build, move pre-build inside
BUILD_COOKIE instead
1994-12-17 01:58:11 +00:00
Andrey A. Chernov f9ff1b665d patch: pre-patch ... is wrong, move pre-patch
inside PATCH_COOKIE
1994-12-14 05:53:09 +00:00
Jean-Marc Zucconi e40adb1bbd Added '${GMAKE} install.man' when installing with Imake and gmake 1994-12-12 22:32:30 +00:00
Gary Palmer ad19367c21 Early md5-checksumming code. This seems to work fine on my machine
but needs more testing on more ports than I have on my box.
1994-12-11 20:36:12 +00:00
Gary Palmer b3ac125106 Last gremlin-killer of the day. Typo fixed and missing .endif replaced. 1994-12-11 15:31:22 +00:00
Gary Palmer d628b1f606 <Sigh> Got the placing of a .if wrong. Fix it. 1994-12-11 14:50:40 +00:00
Gary Palmer 8a7c3fffc6 Erk. Damn. A hash perfixing a comment was lost somewhere.
Fixed.
1994-12-11 14:12:30 +00:00
Gary Palmer e0e109abe7 1) Small tidyup
2) Change INSTALL_MANPAGES to NO_INSTALL_MANPAGES and document it

3) Add a PKGNAME variable to allow the package name
   not to be dictated by stupid DISTNAMEs

4) Add a PATCH_DEBUG option and a slight change to the default
   patch system - add --forward to help ensure correct patching
1994-12-10 18:07:38 +00:00
Andrey A. Chernov 5ddddc4827 Change wrong comment: NCFTP_ARGS --> NCFTPFLAGS 1994-11-25 17:04:02 +00:00
Andreas Schulz 0512285fe2 Don't use a rm -rf WORKDIR if NO_WRKDIR is defined. You have a good chance
to blow away your current dir, because WRKDIR == CURDIR. This should
help tcpblast to not blow away itself in the clean target :-).
1994-11-21 10:30:37 +00:00
Jordan K. Hubbard 4b75ea3568 There seems to be some trouble with install.man working right everywhere.
Conditionalize it off of INSTALL_MANPAGES until I can figure out just
why some X ports seem to like it and others not.
1994-11-17 15:46:27 +00:00
Jordan K. Hubbard ee5b1a1e22 Whoops! Typo. Correct. 1994-11-17 10:07:45 +00:00
Jordan K. Hubbard 07f6028ea8 I found today that making packages for X11 ports wasn't working.
Further investigation showed that prefix was erroneously set to /usr/local
for X11 based ports as well, when the assumption was that they'd really go
into ${X11BASE} (an /etc/make.conf variable that the user's free to set).

Set X11BASE to /usr/X11R6 if the user hasn't already, and assume that
the user really wants prefix to point there when the port is XMKMF based.
1994-11-17 10:06:03 +00:00
Jordan K. Hubbard fcd2dde4e0 Add support for NO_WRKDIR. 1994-11-17 00:25:16 +00:00
Jordan K. Hubbard f877e878c9 2 new concepts that just occurred to me:
MASTER_SITE_OVERRIDE - 	If set in the environment, will override everyone's
	MASTER_SITES settings.  Useful if you'd prefer to point to a
	distfiles repository somewhere closer.

MASTER_SITE_FREEBSD  -  Sets OVERRIDE to be FreeBSD's own master repository.
1994-11-17 00:18:28 +00:00
Jean-Marc Zucconi 1876ac94a7 If USE_GMAKE is defined, use ${GMAKE} in ${XMKMF} && ${MAKE} Makefiles 1994-11-16 23:14:22 +00:00
Jordan K. Hubbard 041c2641f1 Make depends a separate target. Now you can select when the dependency
list is traversed.
1994-11-15 10:16:56 +00:00
Jordan K. Hubbard ff47faa890 Add patch cookies. This should prevent gratuitous patch re-application
attempts.
1994-11-11 09:45:33 +00:00
Jordan K. Hubbard 9e320feef3 For submakes, don't do a `${MAKE} ${MAKEFILE} all' or
`${MAKE} ${MAKEFILE} install', indirect the target through ALL_TARGET and
INSTALL_TARGET now, so they can be easily overridden.
1994-11-03 19:53:46 +00:00
Jordan K. Hubbard 68feb5ef8a Add reinstall target for Poul-H. This lets you install again from
the same build, ignoring the INSTALL_COOKIE.
1994-11-03 19:14:08 +00:00
Jordan K. Hubbard 2e7c3b0abb This is what I get for implementing suggestions without really thinking
about them.. :-)  The patches/* won't work, it needs to be patches/patch-*
to avoid catching things like CVS files when working with a checked-out
copy of ports!  Whoops!
1994-11-01 21:04:27 +00:00
Jordan K. Hubbard c8b2f1c02f 2 changes:
1.	Make build rely on a BUILD_COOKIE now.  I'm tired of builds
	being redone gratuitously while I'm trying to debug a tree build
	problem.

2.	Remove all the literal `touch -f' commands and indirect them through
	variables.  This lets you "leave tracks" in different ways, depending
	on the medium.  Just part 1 of my planned changes to make builds
	directly off the CD work.
1994-11-01 18:09:22 +00:00
Jordan K. Hubbard 9c4fb858bb Make patch rule pick up everything in patchdir alphabetically.
No need to call it `patch-aa' if you can simply call it `aa', etc.
1994-10-31 22:51:09 +00:00
Jordan K. Hubbard 4335d91992 1. PREFIX has nothing to do with DESTDIR. Remove it finally.
2. Make sure to pass PREFIX to sub-makes when installing.  This allows you to
   install to places like ${PREFIX}/bin in your own install rule.
1994-10-22 23:02:39 +00:00
Jordan K. Hubbard cd08c443af Invoke install.man if USE_IMAKE is set. 1994-10-22 09:21:35 +00:00
Andrey A. Chernov 2ecb809ab3 Add ${.MAKEFLAGS} to sub-makes, pointed by Rod 1994-10-14 21:58:09 +00:00
Jordan K. Hubbard cc33ccc9bc Add new IS_INTERACTIVE flag. This lets you specify that the port
is an interactive port, and requires user input somewhere along
the way (either fetching, configuring, building or installing).

If the user then sets BATCH in their environment, this port will be
skipped.  If the user sets INTERACTIVE, then ONLY those ports marked
interactive are run (allowing one to do all ports in two passes).
If the user sets both BATCH and INTERACTIVE, then a metal claw extends
from the CRT and brutally yanks their nose off.
1994-10-14 07:56:46 +00:00
Jordan K. Hubbard c41b51643d Silence the sub-makes. 1994-10-13 10:33:35 +00:00
Jordan K. Hubbard 64324dc610 Change the way pre-install was done after a suggestion from Andrew.
Now both pre-install and install inherit the INSTALL_COOKIE.
1994-10-13 08:08:56 +00:00
Jordan K. Hubbard baaac71882 Re-work the way pre-install was being depended. I couldn't make the
install cookie work any other way (perhaps I'm just being stupid).
In any case, INSTALL_COOKIE now works as advertised, and prevents duplicate
installations.  pre-install users will have to keep their own cookies if
they wish to avoid duplicate installations, or tell me how to make the
rules run properly.
1994-10-12 23:32:32 +00:00