Commit Graph

361 Commits

Author SHA1 Message Date
espie
3d1fe0aec8 Force packages to always go the PKGREPOSITORY, creating it if needed.
Add PKGREPOSITORY to PKG_PATH before pkg_add.

Thanks to aaron, fries, and mickey.
2000-04-02 18:08:31 +00:00
espie
fc07fe0209 Typo 2000-04-02 17:55:45 +00:00
espie
f40fde3df2 Don't propagate DEPENDS_TARGET more than one level deep. 2000-04-02 16:42:27 +00:00
espie
80ebdbdd46 Try to detect people who are not running X-current and tell them about it. 2000-04-02 10:47:54 +00:00
espie
ace22d7082 Oops, make sure FLAVOR is always defined... 2000-04-01 15:49:06 +00:00
espie
46c0b103d1 Add :${FLAVOR} to directory if exists. 2000-04-01 14:57:24 +00:00
espie
bd6d540929 Pass `show VARNAME=' to subdirs. 2000-04-01 14:54:49 +00:00
espie
92252853ec More uniform way to find PLIST, handles more flavors. 2000-03-31 18:51:09 +00:00
espie
0a6b34278e Include guard to avoid getting bsd.own.mk twice. 2000-03-31 18:05:28 +00:00
espie
b4e3992524 Typo 2000-03-30 02:09:31 +00:00
espie
14b5082c96 Depend on the `package' target of subpackages for installing fake packages.
This means that sub packages *won't* be installed, except as an effect of
pkg_add...

Helps finding problems with pkg_add.
2000-03-29 16:34:45 +00:00
espie
cec50f3a08 Flavored ports 2000-03-29 15:59:50 +00:00
espie
73bec0c7e9 Let var appear at the right location.
Clean up indentations, and then clean it up some more.
Based on Camiel's patch, plus some more clean up, thanks Camiel !
2000-03-29 15:41:28 +00:00
espie
07d9ab40f2 Don't record ${PREFIX} in index if it's equal to ${LOCALBASE} 2000-03-28 09:27:03 +00:00
espie
e9ea0eaf2e Create DIST_SUBDIR. 2000-03-27 02:16:48 +00:00
espie
c8a414183a Remove PORTSDIR from describe:, in portsubdir, and in descr.
(noticed by turan, quick and dirty implementation until I clean the
DIRPRFX mess)
2000-03-27 01:52:17 +00:00
espie
45720d825b USE_X11 should mark ports that need X11, but don't say anything about
where they install.

E.g., DON'T TOUCH USE_X11 in existing ports for now, we'll see how we
go about them.
2000-03-26 21:23:20 +00:00
espie
1cbff6e6d1 Trim sed, using same techniques I already did for bsd.port.mk. 2000-03-26 16:57:42 +00:00
espie
a2df2dc131 Missed PORTSDIR in fetch-list. 2000-03-26 16:01:08 +00:00
espie
5503443dd9 Propagate RECURSIVE_FETCH_LIST in a less hackish way. 2000-03-26 15:59:41 +00:00
espie
0e86047220 Don't create a fake /usr/X11R6.
Nor a fake /home (thanks fries@).
Create a fake /usr/local/lib/X11/app-defaults
2000-03-24 21:21:51 +00:00
turan
f77ccdb0f2 MTREE_FILE fix. Some ports did not pass MTREE_FILE into make-plist. 2000-03-24 20:44:01 +00:00
espie
eac4754f84 Crude check for broken links in fake install. 2000-03-21 21:23:54 +00:00
espie
3616337cda No need to display MESSAGE at the end of fake install, for obvious
reasons...
2000-03-21 21:06:58 +00:00
espie
b9822f231d Remove references to ancient versions of LIB_DEPENDS. 2000-03-19 16:46:18 +00:00
espie
17c6fd0f42 Strip :: -> : in dependencies.
(to provide for a seamless way to insert MORE in dependencies)
2000-03-19 16:11:41 +00:00
espie
672066dedb A few PORTSDIR I didn't remove... 2000-03-19 16:04:19 +00:00
espie
859961f085 Add some missing X11 directories under /usr/local. 2000-03-19 02:30:23 +00:00
espie
5e5e9ef727 app-defaults kludge needs to have a test around thanks to ln semantics. 2000-03-19 01:52:46 +00:00
espie
a609419a73 Let X11 ports install under /usr/local 2000-03-18 17:01:34 +00:00
brad
6f2c83e1d8 cdrom.com -> freesoftware.com, From: FreeBSD bsd.port.mk 2000-03-12 19:13:37 +00:00
espie
dbb77da3c4 pre-fake target:
finish setting up WRKINST tree after mtree, but before making the
INSTALL_PRECOOKIE.

See /usr/ports/print/teTeX/base for sample use.
2000-03-10 18:09:23 +00:00
espie
47d1583a64 Fix build-depends/recurse-build-depends to work with PORTSDIR removed.
(no, I'm not going back and adding NEED_VERSION everywhere...)
2000-03-08 00:07:37 +00:00
espie
0754f5f4fb Pass TRUEPREFIX, PREFIX, DESTDIR to pre-install, do-install, install targets
in FAKE mode, to simplify conversion.
2000-03-07 16:14:20 +00:00
espie
f10ac0294a Fix NEED_VERSION location. 2000-03-05 17:02:14 +00:00
espie
d9952f7414 Switch to ${PORTSDIR} before evaluating any dependency.
Makes ${PORTSDIR} in dependencies redundant.
2000-03-05 16:40:52 +00:00
espie
b183552d26 If DISTFILES + PATCHFILES = ALLFILES is empty, no fetch is needed... 2000-03-05 16:33:38 +00:00
espie
2d41326fbf streamline SUBDIRUSE 2000-03-05 16:20:02 +00:00
espie
fffd628669 Document NO_PATCH. Indent stuff correctly. 2000-03-05 16:00:30 +00:00
espie
8285a069ca Add fetch-makefile to bsd.port.subdir.mk, mirror-maker to main Makefile.
Tweak fetch-makefile to take PERMIT_* into account, giving us the level
of control needed.
2000-03-04 18:16:02 +00:00
turan
9f73dffd75 Commenting stuff:
- pretty licensing
- pretty homepage
2000-03-04 18:08:32 +00:00
espie
bac666cf8a Sample scripts for fetch-makefile use 2000-03-04 17:58:32 +00:00
turan
d749ad403d remove trailing -n in make describe
pretty INDEX
2000-03-04 14:40:21 +00:00
turan
5fd5ee65d8 remove trailing | in make describe 2000-03-04 14:36:46 +00:00
turan
881504ae70 Move the test for the existance of license info up into the beginning
of fetch instead of the end of extract.  It only makes sense to do the
check in extract if we are checking the file that contains the license.
2000-03-04 08:35:47 +00:00
espie
2a525277b7 `Fake' infrastructure:
if a port sets FAKE=Yes, this means it can be `pre'-installed elsewhere,
with DESTDIR set to WRKINST (=work/fake-${ARCH} by default).

the infrastructure takes care of pre-install/do-install/post-install targets,
assuming those install stuff under PREFIX.

To help ports to cope with DESTDIR, you can set FAKE_FLAGS and FAKE_TARGET
(used for the fake installation).

Ports with FAKE=Yes are the way to go: they can be packaged directly without
a real installation, and the installation proceeds from the package, thus
forcing porters to check the package.
2000-03-03 21:24:50 +00:00
espie
3ebe7cbccf Mtree changes:
- don't record mtree in packages by default,
- don't run mtree on /usr/local or /usr/X11R6 by default,
- only use MTREE_FILE for plist.
- choose mtree based on PREFIX, since this is what matters.
2000-03-03 20:59:16 +00:00
espie
d51b0446da .bak.orig looks nicer than bak.orig 2000-03-03 20:41:11 +00:00
espie
41d7667013 Basic framework for fetching distfiles for mirrors. 2000-03-03 17:51:37 +00:00
turan
8eaddcf1e3 nix LICENSE_TYPE. This is much prettier now. 2000-03-03 14:23:10 +00:00
espie
11378f3d2b Simplify README.html, reuse last pattern instead of re-specifying it. 2000-02-28 18:13:18 +00:00
turan
38c5179942 two new license types
# DISTONLY:   May distribute the distfile only.
# NOMODIFY:   May not distribute ports that are modified in any way,
#             i.e, the package may not have any patches applied to it.
#             Precompiled packages are fine as long as they do not
#             change the original port.
2000-02-23 06:38:01 +00:00
espie
edba5cfedf MAKEFILE-> MAKE_FILE 2000-02-22 17:08:31 +00:00
espie
fc190877e5 Compute CKSUMFILES in two steps, use that to remove duplicates from
ALLFILES as well...
2000-02-22 14:07:09 +00:00
turan
425c843fcd minor tweaks 2000-02-22 09:27:51 +00:00
turan
1c26980582 make describe, blanks -> ?. typo as well 2000-02-22 09:18:36 +00:00
espie
4c723581ce Compute more of INDEX within make, without external test calls.
Re-indent rules correctly. Only the make tests are indented, the rule itself
still starts after one tab.
2000-02-21 23:53:52 +00:00
turan
73e1d63f8d licensing info in make describe.
make print-licenses target
2000-02-21 22:09:57 +00:00
espie
bbaf95cb8c The MAINTAINER variable is here to be used... 2000-02-20 17:05:40 +00:00
turan
d5bb6b6149 pretty license warning. louis@ 2000-02-19 04:16:23 +00:00
espie
625dd36ea1 Add show target, to be able to enquire about ports variable values. 2000-02-18 22:54:27 +00:00
espie
1eb5506332 Add HOMEPAGE to README.html 2000-02-15 18:19:12 +00:00
espie
4ac17780aa Be consistent in Yes, No.
Add new variables (WRKDIST, WRKSRC, HOMEPAGE), remove old stuff such as
PATCH_SITES.

Be very explicit in explaining about stuff that hardly ever works.
2000-02-15 18:18:10 +00:00
espie
c90ec7c699 Be more thorough in cd ${.CURDIR} && make...
Otherwise, this causes obscure bugs some of the time...
2000-02-15 17:58:32 +00:00
turan
eb9439da63 DISTF -> DISTFILES, PKG -> PACKAGE 2000-02-15 07:28:20 +00:00
brad
098a738afb remove the version number of bsd.port.mk that is specified beside
USE_LIBTOOL and bump the version number listed in the comment section
above it.
2000-02-15 07:05:59 +00:00
turan
7f621f0fea reflect DISTF -> DISTFILES, PKG -> PACKAGE 2000-02-15 05:17:22 +00:00
turan
e11523351e change description of NONE license. 2000-02-13 08:13:46 +00:00
turan
5b4a3fbb2c artistic license 2000-02-13 07:14:13 +00:00
turan
f8ee58bf77 cleanup. espie@ 2000-02-12 20:03:00 +00:00
turan
d3d79d5efd "lic1,lic2" -> "lic1 lic2" espie@ 2000-02-12 19:43:44 +00:00
espie
6aea87cf34 Warning message to stderr, to not interfere with other stuff. 2000-02-12 13:52:04 +00:00
turan
dc8ee597ce more doc 2000-02-12 09:24:30 +00:00
turan
1d168e9d66 cleanup 2000-02-12 08:08:58 +00:00
turan
c92e1e4f21 license framework minus checksums 2000-02-12 06:02:04 +00:00
espie
898da22d5e Remove NO_WRKDIR... The xview ports need a rewrite.
Document NO_WRKDIR as being a bad idea.
2000-02-12 01:00:28 +00:00
espie
c6da62630a Oops, left `build' line visible. 2000-02-12 00:49:17 +00:00
espie
b3ed337056 Change MAKE_FLAGS to remove the -f.
Actually reading the Makefiles proved that about one third of them was
confused about this already...
2000-02-12 00:43:57 +00:00
espie
91dd43bca4 Remove deprecated variables. 2000-02-11 01:11:00 +00:00
espie
2b44b9412b Remove WRKSRC work-around 2000-02-11 00:40:09 +00:00
espie
78bdb819c7 Bye, bye NO_WRKSUBDIR 2000-02-10 23:46:42 +00:00
espie
018d14a85f Repair package building.
Thanks to martin@ for reminding me...
2000-02-09 20:09:05 +00:00
espie
8b20f37bef and of course, nobody spotted the obvious typo in the patch I gave on
ports...
2000-02-09 00:54:33 +00:00
espie
7c8bf5098c Temporary work-around for ports that define WRKSRC manually... 2000-02-09 00:42:39 +00:00
espie
26704f504e Use DIRMODE to install dirs, avoid collisions with mtree
(keep a duplicate of DIRMODE until 2.7)
2000-02-09 00:26:32 +00:00
espie
9ecf27ba4f Introduce WRKDIST: place where stuff unpacks.
May be different from where source lives.
And from where build happens.

NO_WRKSUBDIR=Yes is equivalent to WRKDIST=${WRKDIR}, and not
particularly smaller, deprecated it.

Remove CLEANDISTORIG, use patch -b instead.
Note that DISTORIG ends in .orig to let rm *.orig still work...
2000-02-09 00:23:26 +00:00
espie
aa931bcd50 Kill ALL_HOOK, it's deprecated and unused. 2000-02-06 18:35:24 +00:00
espie
e971455139 Compute CKSUMFILES in a better way, to avoid duplicates.
Simplifies SUPDISTFILES choice: put everything that might ever be fetched
there, don't worry about duplicates.
2000-02-04 20:33:42 +00:00
espie
c24ad602d8 Defining ALLFILES in every case is much better... 2000-02-04 12:55:33 +00:00
espie
8538981335 Finish cleansing PATCH_SITES out. 2000-02-04 11:15:16 +00:00
espie
956abc1070 Remove the real-* targets, do things directly at the cookie level.
More submakes die.

Remove NO_WRKDIR `feature'

Fix `make clean' to do the right thing even if WRKOBJDIR is not defined
at that point.

It's doubtful package-noinstall is useful, but I left it in for now, with
slightly altered semantics.
2000-02-04 11:09:33 +00:00
espie
4df22da508 Don't let real target depend on phony, unless we want the real target to
be rebuilt each and every time...
2000-02-04 00:51:53 +00:00
espie
d7feb40951 Buglet fix: there's absolutely no reason not to run checksum, or
dependencies, if NO_EXTRACT or NO_PACKAGE has been defined ?

Might break some ports that don't explicitly ask not to run those steps.
Good thing.
2000-02-03 22:03:00 +00:00
espie
e150702129 ...twice 2000-02-02 18:33:42 +00:00
espie
158908fdce I am a moron 2000-02-02 18:20:28 +00:00
espie
e5ce6f9944 Cosmetic patch: don't append DIST_SUBDIR if it's not defined.
Set vim filetype, as vi doesn't care.
2000-02-02 15:28:17 +00:00
espie
f0d10863c0 Dependency tweaks.
- put .if defined(XXX) && !defined(YYY) on the same line: less indentation,
more readability.
- set found to true/false directly (builtin).

ALWAYS check that a dependency directory does exist and is a directory.
Catch up typos more quickly, since they will be evident *even if the
dependency is already satisfied*.

Make this only a warning, not a hard error, as we still want to cater
to users with a partially checked out tree...
2000-02-02 00:15:07 +00:00
espie
9fbdb62b2b Undefined PATCH_SITES equivalent to MASTER_SITES,
PATCH_SITESn equivalent to MASTER_SITESn.

Start phasing out PATCH_SITES.
2000-02-01 14:39:20 +00:00
kjell
d61239cad1 missing / in a sunsite. ok espie 2000-01-31 00:12:13 +00:00
espie
01ffa0afd0 Add intermediate `distpatch' target.
This is done in a tricky way, so as not to disturb the usual sequence
of targets. Namely, you still have
fetch, extract, patch, configure, build, install, package,
but patch does invoke a subtarget distpatch when needed,
and you can
fetch, extract, distpatch, patch, configure, build, install, package
for the same results.

Mostly useful for porters: provide an intermediate point to work on
patches, and make it easy to override distpatch/OpenBSD patches separately.
2000-01-30 15:19:40 +00:00