Commit graph

1743 commits

Author SHA1 Message Date
rillig
b85f8bc360 Replaced "done" with "esac" to fix a syntax error. 2005-11-04 20:52:38 +00:00
jlam
290846b86d Relax rules a bit on INSTALLATION_DIRS -- we still enforce that
directories listed in INSTALLATION_DIRS are created in ${PREFIX}, but
it's now okay to include ${PREFIX} at the front of each, directory,
e.g. this is now okay:

	INSTALLATION_DIRS+=	${PREFIX}/bin

Makes using this variable a bit less unwieldy sometimes.
2005-11-04 20:36:42 +00:00
jlam
27daa6762a back out part of previous commit that was unintended. 2005-11-04 20:28:47 +00:00
jlam
8ab0dedc95 Use ${SLEEP} instead of sleep, and note that we use the sleep tool if
we're doing locking.
2005-11-04 20:06:14 +00:00
rillig
87cb035b9e Now that all packages using CONFIGURE_DIRS have been checked (and
modified) to not rely on this change, the default value of BUILD_DIRS
can be set to ${CONFIGURE_DIRS} instead of ${WRKSRC}. There are far more
packages setting CONFIGURE_DIRS and BUILD_DIRS to the same value than
there are packages needing different values, so this default seems more
reasonable. Now the default values are:

CONFIGURE_DIRS?=	${WRKSRC}		# (unchanged)
BUILD_DIRS?=		${CONFIGURE_DIRS}
INSTALL_DIRS?=		${BUILD_DIRS}		# (unchanged)
2005-11-04 11:27:41 +00:00
rillig
214f327f1b Removed the unused variable GNU_CONFIGURE_INFODIR, as suggested by
Stoned Elipod.
2005-11-02 18:32:19 +00:00
rillig
c6348f404b Changed back the default values for GNU_CONFIGURE_{INFO,MAN}DIR to what
they had been before my last change. I had thought it would be more
intuitive if they were based on GNU_CONFIGURE_PREFIX instead of PREFIX,
but this might break some packages.
2005-10-31 09:50:44 +00:00
rillig
1b6c14947f Added two new variables, GNU_CONFIGURE_INFODIR and GNU_CONFIGURE_MANDIR.
Up to now, a package that wanted to use a different location for
--mandir had to first define CONFIGURE_HAS_MANDIR=no and then
CONFIGURE_ARGS+=--mandir=${...}, which looks weird. Now it only has to
set GNU_CONFIGURE_MANDIR.
2005-10-31 09:42:19 +00:00
wiz
d31a568858 Use correct (internal) variable for pkg_add arguments. 2005-10-24 23:23:00 +00:00
rillig
a79249a753 Use $${foo} instead of $$foo to prevent ident(1) from reporting false
positives. No functional changes.
2005-10-24 18:28:42 +00:00
minskim
2ee4956c8b Pass PKG_REQD through shell environment, instead of arguments of make,
so that a dependent package can override it properly.  This makes
INSTALL_MAKE_FLAGS work when a package is installed as a dependency.
2005-10-23 16:58:42 +00:00
tv
38e53d7c11 Use show-vars-eval in show-needs-update. 2005-10-16 17:48:24 +00:00
tv
c46824e8da Add "show-vars-eval" target, which outputs eval-able shell expressions
to allow easy setting of multiple variables in one invocation.
2005-10-16 17:44:45 +00:00
reed
899ff50d6a For INSTALLATION_DIRS, use ${PKGMANDIR} instead of "man".
Also before it used a wildcard for *man and now get rid of that
wildcard in front.
2005-10-10 17:37:17 +00:00
rillig
7102a2e633 CONFIGURE_DIRS, BUILD_DIRS, TEST_DIRS and INSTALL_DIRS are interpreted
relative to ${WRKSRC}. This makes it possible to shorten definitions
like "BUILD_DIRS=${WRKSRC}/foo ${WRKSRC}/bar" in package Makefiles to
"BUILD_DIRS=foo bar". Almost all current uses of those directories are
given as absolute directories (mostly in the form ${WRKSRC}/foo), which
will work as they did before.
2005-10-08 13:16:28 +00:00
rillig
26cc823fb4 Renamed HTML_PKGNAME to _HTML_PKGLINK, which describes its contents more
precisely. Added _HTML_PKGNAME and _HTML_PKGPATH variables for better
readability. Fixed quoting style in print-summary-data.
2005-10-07 17:39:28 +00:00
rillig
1855c76620 Replaced some if's with case's to make the code simpler. Merged
multiple ${ECHO_N} into one ${ECHO}.
2005-10-07 16:57:14 +00:00
reed
f2979429c1 For print-PLIST generation, make sure that ${PKGMANDIR} becomes "man". 2005-10-06 15:25:47 +00:00
seb
a978535e92 whitespace police. 2005-10-04 20:50:49 +00:00
reed
77b8a236ae Add PKGMANDIR in the MAKE_ENV.
(Previously in my own pkgsrc I had done this in
various individual makefiles.)
2005-10-04 17:43:57 +00:00
reed
4d913ad2d9 Remove accidental extra space.
And also fix four places using spaces instead of a tab to be consistent.
(For some reason my cvs diff didn't show anything though.)
2005-10-04 17:33:44 +00:00
reed
15356d0dfb Add custom PKGMANDIR setting to mk/defaults/mk.conf. This is a
pathname relative to ${PREFIX} of directory holding the manual pages
and man directories. I have been using this for over two years.

This defaults to "man" so no change.

If using GNU_CONFIGURE then set --mandir.  (Unless CONFIGURE_HAS_MANDIR
is no because some old GNU configure scripts are too old. This is
similar to existing CONFIGURE_HAS_INFODIR.)

Add PKGMANDIR to PLIST_SUBST.  Add plist awk pattern-action statement
to convert man/ to ${PKGMANDIR}/. (This might need to be double checked
for some PLISTs that prefix some custom settings in front. qmail
used to do this, but now I see it does not.)

When "Decompressing manual pages" convert man/ also.

I have several other changes to commit for individual packages.

I chose not to modify the INSTALL_MAN or INSTALLATION_DIRS
to also convert man/ to PKGMANDIR/ because I thought this may
make it more confusing. So instead, I modify the individual
uses of these instead. (Todo: modify pkglint to check for this?)

(agc@ of the pkgsrc-pmc asked me to make these changes.)
2005-10-04 17:27:00 +00:00
reed
8f1da2c3e0 In man page routines, match the "cat" sub-directories
for cat pages having "[0-9]" suffixes instead of just "0".
Some systems install cat pages with suffix number same as the cat
section number.

(This has been in my pkgsrc tree for probably a couple years,
but looking today, I do see man/cat1/ftp.1 on one of my systems.)
2005-10-04 16:45:25 +00:00
rillig
5ebf566f7d Added a variable LICENSE_FILE that may be set to point to the license
file of the package. It does _not_ replace the LICENSE variable. The
variable is currently only used in the show-license target. It is
intended that LICENSE_FILE is used for licenses that only apply to a
single package or a package group, so that the number of licenses in the
licenses/ directory is kept small.
2005-09-28 08:24:52 +00:00
jlam
fe848c1105 Remove the CHECK_FILES bits during deinstall so that they are regenerated
from scratch during a reinstall.  This makes CHECK_FILES more useful when
debugging packages with broken PLISTs.
2005-09-16 06:09:02 +00:00
xtraeme
e07a2c7d8b _RESUME_TRANSFER: only try to get the value of the temp file when it's
available.
2005-08-26 14:47:30 +00:00
jlam
f1e3e67038 INSTALLATION_DIRS implies NO_MTREE: If a package sets INSTALLATION_DIRS,
then it's known to pre-create all of the directories that it needs at
install-time, so we don't need mtree to do it for us.
2005-08-18 19:24:15 +00:00
jlam
9dcc7aa6ed Fix an annoying whitespace issue for 80 character-width displays. 2005-08-15 17:35:45 +00:00
rillig
60e46baa8e In print-pkg-size-this, initialize s before summing up all file sizes. This
results in "0" being printed for empty packages, which had been "" before.
Fixes PR 30955.
2005-08-15 13:05:18 +00:00
rillig
fee89c334d Reverted the change from revision 1.1710, which sorted all DEPENDS and
BUILD_DEPENDS alphabetically. Some packages depend on the
first-come-first-serve order.
2005-08-14 19:52:26 +00:00
kristerw
493773dd73 The check-files-post need to be done before post-install-script,
to prevent errors from pacakes using e.g. CONF_FILES.
2005-08-14 17:26:13 +00:00
kristerw
7af58065d9 Move the check-files-post check so that it is done after the automatic
manual page handling.  This prevents the check from reporting errors
for manpages that are (un)compressed by the automatic manual page handling.
2005-08-10 18:21:07 +00:00
veego
51a055db51 Restore the @(..)s which were removed in rev 1.1706.
They are needed in the fetch-list case to prevent outputting anything if
the distfile is allready in $DISTDIR.
2005-08-08 15:38:19 +00:00
rillig
4b97388467 Sort the dependencies list alphabetically when checking if they are
installed. That makes it easier to check if a specific package is listed
or not.
2005-07-22 18:59:55 +00:00
jlam
4032855bac Override the INSTALL setting in sys.mk that messes up the rest of the
logic in the tools framework.
2005-07-17 04:17:09 +00:00
jlam
3e474a90d8 Get rid of USE_PERL5. The new way to express needing the Perl executable
around at either build-time or at run-time is:

	USE_TOOLS+=	perl		# build-time
	USE_TOOLS+=	perl:run	# run-time

Also remove some places where perl5/buildlink3.mk was being included
by a package Makefile, but all that the package wanted was the Perl
executable.
2005-07-16 01:19:06 +00:00
jlam
bf9129c41e Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making
PKGSRC_USE_TOOLS go away.  There is now only a single USE_TOOLS variable
that specifies all of the tools we need to build/run the package.
2005-07-15 18:27:48 +00:00
reed
c3c7946905 For the fetch-list target: Do not use mkdir if just creating a shell
script that will make the directory later. This fixes the problem
where it fails when doesn't have write access -- for example use
"make fetch-list" to create the shell script to use on another
system.

Thank you, Geert Hendrickx, for your feedback.

Also in a few places echo ${fetchfile:T} instead of ${fetchfile}.

(Todo: maybe should not say "not fetched" until has tried all sites.)
2005-07-06 05:52:34 +00:00
rillig
8506e905d6 pkglint does not output any "OK" lines by default, so there's no need to
filter them out.
2005-06-27 16:25:43 +00:00
wiz
2baa8b4a15 Improve English in warning. From Rhialto in PR 30610. (second occurrence) 2005-06-27 13:34:41 +00:00
wiz
6328437570 Improve English in warning. From Rhialto in PR 30610. 2005-06-27 13:33:55 +00:00
jlam
6efbd72779 Clean up some clutter in pkgsrc/mk: move the ${OPSYS}.*.dist mtree
files into mk/platform, where they now live with the ${OPSYS}.mk files.
2005-06-23 18:41:57 +00:00
wiz
085d1a2044 Back out previous -- committed by mistake. 2005-06-23 12:12:11 +00:00
wiz
e95f3821fb Add missing line continuation backslashes.
Noted by Jukka Salmi.
2005-06-23 12:11:07 +00:00
jlam
5d1e8de6bc Split out the check-wrkref implementation and related variables from
bsd.pkg.mk into bsd.pkg.check.mk file.
2005-06-23 09:02:46 +00:00
jlam
6ae4606464 Split out the check-files implementation and related variables into
a new bsd.pkg.check.mk file.  This new file will eventually collect
all of the various "check" targets that are run at install-time.
While here, change the implementation of check-files so that it is
not so monolithic.

Change the meaning of the CHECK_FILES variables so that if it's not
"no", then the file checks are run.  Also, allow these checks to be
run if the user explicitly sets CHECK_FILES in /etc/mk.conf, even if
PKG_DEVELOPER is not defined.
2005-06-23 08:31:20 +00:00
jlam
8d486b1ebd Reverse the checks for the value of CHECK_WRKREF so that if it's value
isn't "no", then we run the checks.  This allows for possibly making
CHECK_WRKREF a more multi-valued option or list in the future.
2005-06-23 04:15:47 +00:00
jlam
ccd8fe4d4c Allow the test for whether the file is a text file to be overridden via
CHECK_WRKREF_IS_TEXT_FILE.
2005-06-14 22:02:00 +00:00
jlam
1ffcef48db In the check-wrkref target, change the algorithm so that text files
are checked for ${WRKDIR}, but all files are checked for ${TOOLS_DIR}
(assuming that ${TOOLS_DIR} is in ${WRKDIR}).  Also, let CHECK_WRKREF_PKG
set the name of the package to check.
2005-06-13 02:25:50 +00:00
jlam
df53a167da Add a default fall-through for the shell case statement (portability
issue).
2005-06-11 04:26:17 +00:00