Commit Graph

72 Commits

Author SHA1 Message Date
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
Andrey A. Chernov
3d1e296ec5 Oops, change ${MAKE_FLAGS} to ${MAKEFLAGS} in pre-configure line 1994-10-12 03:25:59 +00:00
Andrey A. Chernov
ec55794466 Move 'make pre-configure' inside .configure.done: target, or
it issued again and again instead.
1994-10-12 03:12:19 +00:00
Andrey A. Chernov
b82fc8c612 configure: pre-configure extract ... must be
configure: extract pre-configure ...
1994-10-12 02:58:38 +00:00
Jordan K. Hubbard
363abea01c Following changes from Robert Withrow (+ a few mods):
1. Make DEPENDS fully qualified, and not implictly assume relative
   to ${PORTSDIR}.  This allows more arbitrary dependencies to be
   specified.  This also means that DEPENDS= x11/foo needs to be changed
   to DEPENDS= ${PORTSDIR}/x11/foo in any Makefiles.  I'll try to do
   these changes myself.

2. Add an option NO_DEPENDS to disable the automagic building of depended
   ports.
Submitted by:	rww
1994-10-05 22:28:45 +00:00
Jordan K. Hubbard
997882fda7 Add an install prefix for packages, so that they're built by default
to track ${PREFIX} (this will override the PLIST prefix).
1994-10-04 15:50:43 +00:00
Jordan K. Hubbard
0903bf364c Also make GNU_CONFIGURE a synonym for HAS_CONFIGURE so you don't have
to specify both (looks silly).
1994-10-04 15:48:21 +00:00
Jordan K. Hubbard
e492ce08e3 If GNU_CONFIGURE is set, pass `--prefix=${PREFIX}'; this should help
at least the GNU ports play nice with PREFIX.
1994-10-04 15:44:03 +00:00
Jordan K. Hubbard
3ca98f18d2 Whoops! Forgot to pass PREFIX to the configure subshells. Done. 1994-10-04 14:46:34 +00:00
Jordan K. Hubbard
ed40335903 Add PREFIX pointing to ${DESTDIR}/usr/local - let's see if we can't
make an entire system work nicely with DESTDIR (to say nothing of being
able to move from /usr/local to somewhere else).
1994-10-04 14:44:56 +00:00
Jordan K. Hubbard
382f755da5 Prevent duplicate installs with an install cookie.
Make DEPENDS now does a `make is_depended' in the target port.
This defaults to `all install' globally, but can be overriden locally
by a port if it wants to do different things when other ports depend on it.
1994-10-03 14:38:27 +00:00
Jordan K. Hubbard
7ae01964d7 May the saints praise Robert Withrow <witr@rwwa.com> for showing me
the light.  `env' can be used to pass environment variables to shell
scripts this way, which means that all *configure/post-build scripts
_no longer take any arguments_; everything they should need (and more)
is now available in the environment.  I'm working now to adapt the older
shell scripts over, but if you want beat me to it on some of your own
ports, don't let me stop you! :)
Submitted by:	witr
1994-10-03 13:45:03 +00:00
Jordan K. Hubbard
ccd314ec46 Don't hardcode patch and its arguments. Not quite the same patch as submitted
by Robert Withrow, but he prodded me into thinking about it again.  Thanks, Rob.
1994-09-28 14:19:30 +00:00
Steven Wallace
5df5c6ab16 change COOKIE directory from .CURDIR to WRKDIR since a user may not have
write permission to .CURDIR but write permission to WRKDIR.
Also, WRKDIR may be deleted and cookie still exist in CURDIR.
1994-09-22 07:45:30 +00:00
Jordan K. Hubbard
724a286e43 Modified DEPENDS rule so that anything you depend on gets both
made AND installed.  Folks, check out DEPENDS if you have one port
that depends on another!  With this change, it should be really convenient
to use.
1994-09-19 01:08:35 +00:00
Andrey A. Chernov
9e5efb09f2 DESTDIR added to PORTSDIR definition 1994-09-19 00:41:03 +00:00
Jordan K. Hubbard
bcb015defb Don't assume / seperator between site name and dist file in fetch. 1994-09-14 15:30:44 +00:00
Jordan K. Hubbard
d58fb42f4a Missing semi-colon after a done statement. Fixed. 1994-09-13 08:40:27 +00:00
Jordan K. Hubbard
eef2ed537a Adjust comments to document MASTER_SITES and remove mention of
HOME_LOCATION.
1994-09-13 06:43:10 +00:00
Jordan K. Hubbard
cd003c0b48 Ok, I think I have this whole HOME_LOCATION / MASTER_SITE stuff resolved
to a reasonable compromise:

MASTER_SITES now contains a space seperated list of sites for which each
DISTFILE may be retrieved.  This should be a directory spec, which will be
concatenated with each file in DISTFILES.  HOME_LOCATION is *gone* now
and isn't used for anything, so you can delete it from your Makefiles.
If you want to force a fetch from a given location, simply do something like:

	MASTER_SITES=	ftp://fnord.foo.bar/pub/dist
	DISTFILES=	a.tar.gz b.tar.gz

Your entry in MASTER_SITES will be tried first to fetch a.tar.gz and
b.tar.gz, followed by any master sites we have set up (right now, only
freebsd.cdrom.com).
1994-09-13 06:22:11 +00:00
Jordan K. Hubbard
65273efbc6 More fixes and general cleanup. Add more fine-grained control over what
is fetched and what is actually unpacked.
1994-09-11 12:55:54 +00:00
Jordan K. Hubbard
31c01ba466 Whoops, forgot to stop this lurking typo, too. 1994-09-11 12:06:34 +00:00
Jordan K. Hubbard
d1c149c330 Eliminate a few lurking bogons - this is almost close to being right! 1994-09-11 12:01:05 +00:00
Jordan K. Hubbard
43497b9f75 Annual simplification drive:
1. DISTFILE is gone and replaced by DISTFILES, which can contain one or
   more file specifications.
2. MASTER_SITE created, which points to the distfiles directory on
   freebsd.cdrom.com (which I'll set up in a moment).
3. HOME_LOCATION is now simply a hint, and is never directly used except
   to inform the user when ncftp unable to transfer a file from
   MASTER_SITE.
4. ncftp is now assumed to live somewhere in the path, in preparation for
   Andrew bringing it in on a more permanant basis.
5. XMKMF defined - it was not before.

Thanks to Andrew (ache) for many helpful suggestions.
1994-09-10 22:26:47 +00:00
Jordan K. Hubbard
e86de4095d Rearrange this a bit while I think about the whole problem of fetching
multiple targets when dealing with creating a set of distribution files
from scratch.  Another problem is *verifying* that a given file fetched
from its HOME_LOCATION is the one we wanted (what if the stupid ftp site
maintainer updated it in place?).  Rich Morin pointed this out and suggested
some solutions.  I need to think about it some more (suggestions?).

For now, we have a seperate `fetch' and `extract' target.
Submitted by:	jkh
1994-09-09 06:21:43 +00:00
Jordan K. Hubbard
8315b1014c As per suggestion by Michael Reifenberger, make ncftp use the -N flag.
Reviewed by:	jkh
Submitted by:	mr
1994-09-09 00:17:47 +00:00
Jordan K. Hubbard
c66c40460e Fixed a couple of typos. Ok, this works now. Only one significant hurdle
remains, and that's that this does not work with multiple targets, which
sort of throws the tk and fvwm distributions into a mess.  tk needs both
a tarball and a patch file from the same site, fvwm needs up to 3 different
files if you want all the options.  If anyone wants to take this the last
few steps of the way towards somehow handling cases like this, I'd be very
happy.
Submitted by:	jkh
1994-09-02 01:53:33 +00:00
Jordan K. Hubbard
9f421ad238 Ok, I've reviewed this and made it work now. ncftp fetching seems to be
working/closer to working now.
Submitted by:	jkh
1994-09-02 01:32:13 +00:00
Jordan K. Hubbard
e9ea29f3fe Add a few missing >> lines to error echo's.. This is basically my
convention to make searching for error messages easy.
Submitted by:	jkh
1994-09-02 01:13:47 +00:00
Jordan K. Hubbard
b9e3359515 Here's my first cut at doing auto-fetch with ncftp. The extract rule
is turning into the original make rule from hell!
Submitted by:	jkh
1994-09-01 18:03:37 +00:00
Jordan K. Hubbard
3158984cf8 Geeze, what was I thinking again? Replace all references to:
${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}

With simply `${DISTFILE}' which defaults to the above.  This lets you
easily name distribution files that don't cooperate with any rational
naming syntax.

Similarly, make a variable called ${PKGFILE} which fills the same purpose
for packages.

Just trying to make this thing really really general to suit every need.
Now I need somebody to figure out how to make the extract target auto-fetch
things from ${HOME_LOCATION} with ncftp *if* ncftp is installed and it
looks possible to reach the foreign site.  That will take some fancy footwork,
but would be slick.  I've changed this too so that HOME_LOCATION is no longer
set by default, allowing you to do an .if defined(..) check for it.  The
extract rule now does this too.

Submitted by:	jkh
1994-09-01 16:01:34 +00:00