Commit graph

87 commits

Author SHA1 Message Date
drochner
a371762cf6 move the install/deinstall templates from scrollkeeper to rarian
to reflect where the work is done
(call the backwards-compatible rarian version "install-scrollkeeper"
to leave room for a future non-compatibility version)
2007-11-12 20:41:18 +00:00
drochner
60baec7bc9 remove the meat of scrollkeeper -- the library is not used by any pkg
anymore, and the users of .omf file install scripts are redirected to
"rarian" which provides compatible (to the caller) implementations
2007-11-12 20:01:31 +00:00
jmmv
f9398f2617 rarian conflicts with scrollkeeper, so the reverse is also true. Then,
add a conflicts line with rarian.
2007-11-05 15:56:13 +00:00
drochner
761c6ffe7f Switch to use the scrollkeeper compatible wrappers which come with
the new "rarian" document manager. rarian (as configured currently)
can read .omf files directly, so the wrappers are basically no-ops.
Keep the "rarian" dependency anyway to avoid major reorganisations
in the future.
2007-10-31 20:26:21 +00:00
wiz
601583c320 Whitespace cleanup, courtesy of pkglint.
Patch provided by Sergey Svishchev in private mail.
2007-02-22 19:26:05 +00:00
abs
da03c5459c We use iconv, so add its buildlink3.mk. Also set ICONV=iconv in the
environment to avoid the build failing due to the 'extra smart' build
system in here taking "iconv" in intltool-merge.in and replacing it
with "/usr/pkg/bin/iconv"
2006-12-03 19:47:48 +00:00
joerg
68f088dd4f DESTDIR support. 2006-11-14 13:56:15 +00:00
jlam
c16221a4db Change the format of BUILDLINK_ORDER to contain depth information as well,
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto
2006-07-08 23:10:35 +00:00
jlam
9430e49307 Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.
2006-07-08 22:38:58 +00:00
jlam
00478b39e6 Sweep pkgsrc and convert packages that included intltool/buildlink3.mk
to use instead "USE_TOOLS+=intltool".  Remove now unused
intltool/buildlink3.mk
2006-07-05 05:37:39 +00:00
jlam
e811379bc2 Pluralize INSTALL_TEMPLATE and DEINSTALL_TEMPLATE variable names as per
the pkglint warning:

    As {INSTALL,DEINSTALL}_TEMPLATE is modified using "+=", its name
    should indicate plural.

This does make the variables a bit more suggestive of the fact that they
hold lists of values.
2006-06-15 22:13:58 +00:00
jlam
827643d4bb Split out deinstall portions of INSTALL scripts into DEINSTALL scripts.
This avoids the need for a confusing line of the form:

	DEINSTALL_TEMPLATE+=	path/to/INSTALL

in the package Makefile, and actually removes the need to specify it
altogether since by convention, the existence of the DEINSTALL script
is enough to add it to DEINSTALL_TEMPLATE.
2006-06-15 20:40:15 +00:00
schwarz
de1063e2b2 made sure auxiliary programs are later found even if ${LOCALBASE}/bin is
not in the shell's path
2006-06-04 21:09:30 +00:00
jlam
ea5f9f80b6 Strip ${PKGLOCALEDIR} from PLISTs of packages that already obey
PKGLOCALEDIR and which install their locale files directly under
${PREFIX}/${PKGLOCALEDIR} and sort the PLIST file entries.  From now
on, pkgsrc/mk/plist/plist-locale.awk will automatically handle
transforming the PLIST to refer to the correct locale directory.
2006-04-17 07:07:11 +00:00
jlam
1cf9796f3c BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with
USE_TOOLS+=msgfmt.
2006-04-13 18:23:29 +00:00
rillig
96fc47c14f Aligned the last line of the buildlink3.mk files with the first line, so
that they look nicer.
2006-04-12 10:26:59 +00:00
reed
5abef9be14 Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).
2006-04-06 06:21:32 +00:00
jmmv
0d6959827c Require a docbook-xml package that has correct rewriteSystem entries in its
catalog files so that registering some documents (e.g., those from totem)
works correctly.  Bump PKGREVISION to 10.
2006-04-01 14:48:21 +00:00
jlam
11993b86ed Bump PKGREVISION for all packages that had broken INSTALL/DEINSTALL
scripts prior to revision 1.43 of bsd.pkginstall.mk.
2006-03-21 06:00:43 +00:00
jlam
daad0f3d6c Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.

If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts.  If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:

	INSTALL_SRC=	${PKGDIR}/INSTALL
	DEINSTALL_SRC=	# emtpy

As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts.  By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).

In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework.  The only public variables relating to the templates are:

	INSTALL_SRC		INSTALL_TEMPLATE
	DEINSTALL_SRC		DEINSTALL_TEMPLATE
				HEADER_TEMPLATE

The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
2006-03-14 01:14:26 +00:00
jlam
9c8b5ede43 Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where no
developer is officially maintaining the package.

The rationale for changing this from "tech-pkg" to "pkgsrc-users" is
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list).  Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't
developers.
2006-03-04 21:28:51 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
wiz
768c589c29 Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.
2006-01-24 07:31:52 +00:00
jlam
dc9594e09d Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.
2005-12-29 06:21:30 +00:00
rillig
579e977969 Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
2005-12-05 23:55:01 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
jlam
585534220c Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison
2005-05-22 20:07:36 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
jmmv
9fb319d5c3 Bump docbook-xml's revision to 7 now that its catalog is registered again
and make scrollkeeper depend on this latest version to fix its build.
Problem found by abs@ (as described in tech-pkg@).
2005-03-29 14:40:36 +00:00
jlam
da2fc85390 Don't check for USE_BUILDLINK3 anymore in these files. These are included
by other package Makefiles, and with the deprecation of USE_BUILDLINK3
support in the infrastructure files, these had the potential to break
existing packages.
2005-03-24 22:42:58 +00:00
agc
c71cac836a Add RMD160 digests to the SHA1 ones. 2005-02-24 14:48:39 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jlam
1a280185e1 Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".
2004-09-22 08:09:14 +00:00
recht
df9f6259c7 bump PKGREVISIONs since libxslt needs libgcrypt now 2004-07-06 16:28:52 +00:00
xtraeme
3be38dae2b Enable pkgviews installation. 2004-06-04 23:58:12 +00:00
minskim
d11ac9db77 Register .dtd files in the system catalog and bump PKGREVISION.
OK'ed by jmmv@.
2004-05-06 16:23:16 +00:00
minskim
4ed70d19fe Avoid installing nonexistent files and directories for them. Also
remove related @dirrm entries, which only cause annoying error
messages with pkg_delete.

PKGREVISION will be bumped in a minute with another fix for this
package.
2004-05-06 16:20:17 +00:00
wiz
659fd7654f Remove bl2 support -- all packages including this file
have been converted.
2004-04-27 01:26:29 +00:00
wiz
f7906f6e94 Unused. 2004-04-26 09:21:57 +00:00
jmmv
92181d1d58 During print-PLIST, do not output files inside scrollkeeper's database
(libdata/scrollkeeper), and for the removal of the share/omf directory,
print a comment telling that it's beeing removed by this package.
2004-04-12 21:08:15 +00:00
jlam
7db11b582a Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 09:12:08 +00:00
jmmv
28a14bbcbe Don't hide messages when calling scrollkeeper-update; the only ones that may
appear are errors and/or warnings, and we want these to be shown to catch
possible problems ASAP.
2004-03-07 11:53:43 +00:00
jmmv
ad018dca7b Fix fatal typo that avoided updates of the database (resulting in no
documentation available from yelp, for example).
2004-03-07 11:53:00 +00:00
jmmv
77d179dc36 Register installed DTDs in the catalog file, so that scrollkeeper-update can
find them.  Bump PKGREVISION to 2.
2004-03-07 11:50:18 +00:00
jlam
9ff0e10340 Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 19:25:06 +00:00
jmmv
af68c97ba1 Use tabs for indentation instead of spaces. 2004-02-15 21:39:14 +00:00
jlam
3ebe053d90 LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
2004-02-14 17:21:49 +00:00
jlam
1db7d040be Cut-n-paste... it's so easy... easy to miss errors, that is. 2004-02-12 10:20:33 +00:00
jlam
856fb839ef Allow this file to keep working with packages that haven't been bl3ified. 2004-02-12 10:05:08 +00:00
xtraeme
79317ebe2d bl3ify 2004-02-11 04:35:20 +00:00