Commit graph

48 commits

Author SHA1 Message Date
jlam
cf4dfe44a5 Use REQD_DIRS instead of MAKE_DIRS for directories under ${PREFIX} so
that these directories will be conditionally removed (based on reference
counts), regardless of the value of PKG_CONFIG.  Bump the PKGREVISION
for packages that were modified as a result.
2005-08-20 19:16:21 +00:00
jlam
bd2788d930 Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files.  Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
2005-08-19 18:12:36 +00:00
rillig
09db5e7a58 Replaced $c with ${c} to make pkglint happy. 2005-05-22 21:54:59 +00:00
jlam
962622ba7d Rename mk/bsd.pkg.install.mk to mk/install/bsd.pkginstall.mk to
consolidate the files for that framework in one directory.
2005-05-11 02:07:37 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
jmmv
b4228a464e Use XMLCATMGR_PREFIX (defined in buildlink3.mk) rather than
BUILDLINK_PREFIX.xmlcatmgr because the latter is not defined if NO_BUILD
is set.

Fixes problems seen by abs@ (docbook-xml's catalog not appearing in the
system-wide catalog).
2005-03-29 14:39:15 +00:00
jmmv
988044b55f Use EVAL_PREFIX to determine where xmlcatmgr is installed (instead of
BUILDLINK_PREFIX.xmlcatmgr), and set the XMLCATMGR variable accordingly.
This is to let packages setting NO_BUILD to still be able to use this
variable (such as docbook-xml).

Fixes PR pkg/29789 by chris@.
2005-03-26 16:54:51 +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
reed
476a159da8 Increase BUILDLINK_DEPENDS.xmlcatmgr to xmlcatmgr>=2.0beta1
which was the BUILDLINK_RECOMMENDED.xmlcatmgr. (Okay'ed by jmmv.)

I had noticed that old xmlcatmgr on my system (using IGNORE_RECOMMENDED)
was not good enough

The xmlcatmgr changes for 2.0alpha2 said that command line usage changed
in some scenarios.

Also remove BUILDLINK_RECOMMENDED.xmlcatmgr because now it was the
same (and is redundant for now).

I am not bumping in PKGREVISIONs because of this.  This happened
last January and is too late now and maybe I am the only person to
notice.
2004-10-09 23:16:14 +00:00
jmmv
ef3c79882c Some PRINT_PLIST_AWK magic for share/sgml and share/xml. 2004-09-02 11:38:07 +00:00
jmmv
6e41f0dee6 Update to 2.2:
Third stable version of the 2.x branch, released on 2004/09/01.

* Converted to use the GNU Build System (GNU Automake and GNU Autoconf).

* Because of the previous change, the build has been hopefully fixed in
  several platforms, specially under Irix 6.5 using the MIPSpro C compiler.
2004-09-01 09:43:16 +00:00
wiz
0ddc5bd083 Really test CC_VERSION, as previous commit message suggests. 2004-07-04 08:43:03 +00:00
grant
9687065817 test CC_VERSION instead of USE_MIPSPRO. 2004-07-03 14:00:28 +00:00
minskim
4ae0015acd Quote arguments properly for xmlcatmgr. OK'ed by jmmv@. 2004-05-06 14:39:05 +00:00
jmmv
45c560ba70 Update to 2.1:
Second stable version of the 2.x branch, released on 2004/05/02.

* Fixed an attribute name when parsing the `uri' tag in XML catalogs; it
  expects `name', not `uriId'.

* Fixed a warning message when removing entries from an XML catalog.

* Fixed several warnings when building mem.c code in a system with glibc
  2.[23].x and -O2 enabled.

* Added the `-p' flag which changes the behavior of the `add' action so
  that new entries are prepended instead of appended.

* Improved consistency of the lookup action so that it behaves equally
  for SGML and XML catalogs (this includes making XML lookup show all
  matching entries).

* Documentation is now installed in an unversioned directory by default.
2004-05-02 10:29:21 +00:00
wiz
61503b91f8 Remove support for bl2 since remaining packages
using this have been converted to bl3.
2004-04-28 07:11:44 +00:00
wiz
f6a39b9dce Re-instate for now (catalogs.mk _sets_ USE_BUILDLINK2). 2004-04-27 17:28:50 +00:00
wiz
f7906f6e94 Unused. 2004-04-26 09:21:57 +00:00
jschauma
ff5a7875da The MIPSPro compiler chain needs a "-c99" flag if the code claims to
be C99 code (for example: use of stdbool.h).  This allows this package
to build under Irix 6.5 using MIPSPro.
2004-04-22 13:11:58 +00:00
jmmv
1b65d92b2c During print-PLIST, print comments and do not remove the catalog files under
share/(xml|sgml) nor these directories themselves.
2004-04-12 21:12:44 +00:00
jmmv
48c209b63d Update to 2.0:
First stable version of the 2.x branch, released on 2004/03/26.

* Fixed build under HP-UX and Tru64 Unix.

* Fixed a crash that occurred during parsing of some malformed XML
  catalogs.
2004-03-28 19:51:06 +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
jlam
beb6679f7f Missing an :M operator on the match for "yes". 2004-02-01 10:17:21 +00:00
jlam
7c294cef3b Preserve previous behaviour by unconditionally setting USE_BUILDLINK2 if
we're not already using buildlink3.
2004-02-01 10:12:58 +00:00
jlam
cc930177c2 Add a buildlink3.mk file for xmlcatmgr and teach catalogs.mk to use the
buildlink3.mk file if USE_BUILDLINK3 is "yes".
2004-02-01 10:11:39 +00:00
rh
2e520ef7b9 Don't force binary package consistency through BUILDLINK_DEPENDS, we now
have BUILDLINK_RECOMMENDED for this.
2004-01-24 01:31:45 +00:00
jmmv
850572fa4d Update to 2.0beta1:
Released on 2004/01/23, its state was beta.

* Recognize two default catalog files, one for XML and one for SGML,
  instead of only one as in previous versions.

* Added the `-h' option to xmlcatmgr, which shows a descriptive usage
  message.

* Added multiple comments to the code, explaining what each function does.

* Some bug fixes.

The version in the buildlink2.mk file is bumped because there were some
incompatible changes done in the previous version that may cause problems
to people upgrading an already installed package.  This should have really
happened in the previous version... but well, as this is now beta, there
shouldn't be any interface changes any more.
2004-01-23 17:12:16 +00:00
jmmv
d79f69e2b6 Update description according to xmlcatmgr's 2.x branch. 2004-01-18 11:00:17 +00:00
jmmv
5a7cc41b85 Update to 2.0alpha2:
Released on 2004/01/17, its state was alpha.

* Fixes to allow multiple entries with the same content in both SGML and
  XML catalog files.  Sorry but this may break command line compatibility
  with old versions in some scenarios; that is, the "remove" action now
  takes pairs of values.  Even though, if just one argument is given to
  "remove", it behaves as before to help the transition to newer versions.

* New catalogs are created now in memory before writting them to disk.
  This ensures that they will look exactly the same after creation and
  after some manipulation (addition and removal of entries).

* Added an option to configure, '-n doc', to disable installation of
  distribution documentation files in the system.

* Some bug fixes.
2004-01-17 16:00:20 +00:00
jlam
4b90d17ed9 From the log for rev. 1.1260 of bsd.pkg.mk:
"Package Makefiles should refer to PKG_SYSCONFBASEDIR instead of
 PKG_SYSCONFBASE when they want PKG_SYSCONFDIR stripped of
 PKG_SYSCONFSUBDIR.  This makes PKG_SYSCONFBASE=/etc work with pkgviews by
 installing all config files into /etc/packages/<pkg> instead of
 occasionally putting some directly into /etc."
2004-01-07 02:21:16 +00:00
jlam
fe69a47fe5 bl3ify 2004-01-05 23:34:03 +00:00
jmmv
9e51645da2 Enable developer mode (so that assertions are kept). This should be removed
when the 2.x branch of the program is stabilized.
2003-12-23 11:56:41 +00:00
jmmv
537fb9f927 Update to 2.0alpha1. This is the first version of the development branch.
I'm updating the package to this version because it should fix many
portability issues (avoiding the installation of GNU tools), and because
it is a lot safer when modifying existing catalog files (not line oriented
any more and with real file locking).

I've tested the program under several other systems and platforms (including
FreeBSD, Linux and Solaris, the later with the sunpro compiler too), and it
built and worked fine.  Thanks to simonb@ for testing under an Alpha system
with pkgsrc.

Change log follows:

Released on 2003/12/23, its state was alpha.

* xmlcatmgr has been completely rewritten in C.  Even though, command line
  compatibility has been kept, so that existing scripts using this program
  do not break.

* Buildtool is not used any more.  A custom build infrastructure has been
  implemented, as something small and very portable was needed.

* Added the `lookup' action, used to search for entries in catalogs.

* Added real parsers to manipulate SGML and XML catalogs.  The program is
  not line oriented any more, thus beeing a lot more flexible.

* Multiple race conditions fixed, which were unavoidable from a shell
  script.

* Better handling of special characters and spaces in strings, difficult
  to handle from shell scripts.
2003-12-23 11:45:05 +00:00
jmmv
9df6598823 Update to 1.2:
Released on 2003/12/16, its state was stable.

* Added the BT_PROG_GREP variable to the build system; this is to allow the
  user override the grep program used by xmlcatmgr.  In some systems, like
  Solaris, the -F flag is not supported, so an alternative must be used.
2003-12-16 22:45:33 +00:00
sketch
f6c197ca04 Ensure a version of grep is used which can handle the -F argument. 2003-12-16 11:33:44 +00:00
jschauma
ed378ed165 Use a GNU awk, so that this creates the files correctly.
Pointed out by Bas van Oostveen in PR pkg/23514.
2003-12-04 04:35:25 +00:00
jmmv
a1746bbfcb Update to 1.1:
* Fixed AWK code generation to work with the mawk interpreter.
* Fixed Makefile.boot to install documentation inside the directory pointed
  by the BT_DIR_DOC variable.

Thanks to reed@ for mawk fixes and grant@ for Solaris tests.
2003-10-13 12:12:57 +00:00
jmmv
18b182d4cf Update to 1.0:
* Adapted Buildtool scripts to the latest version, 0.14.  As a side effect,
  distribution documentation is now installed into the system.
* Minor manpage fixes.
* Code cleanup.

Fixes in the package: avoid overwriting catalog files when using 'make
replace' (if you have 0.2 installed actually, it won't take any effect, so
be careful by backing up pkg/share/{sgml,xml}/catalog).  'make update' will
work fine.
2003-09-08 12:26:20 +00:00
jmmv
3c8e6774f3 Move the definition of XMLCATMGR, SGML_DEFAULT_CATALOG and XML_DEFAULT_CATALOG
variables from the catalogs.mk file to buildlink2.mk.  These may be needed in
a package that does *not* provide catalog files (i.e., all the functionality
in catalogs.mk is not required).
2003-07-22 18:25:09 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
jmmv
a08f5b5b1c Update HOMEPAGE. 2003-04-05 18:31:37 +00:00
jmmv
7381ae93eb Override install commands, to fix installation in SunOS. Pointed out by
Brian Harrington in PR pkg/20971.
2003-04-01 08:20:08 +00:00
jmmv
566d9afee3 s/PKGBASE/PKGNAME/ (gives more information, and looks better ;) 2003-03-17 17:46:49 +00:00
jmmv
50c90b2f77 Update xmlcatmgr to 0.2. Changes in this version:
* Added XML Catalogs management.  You must use the new `-s' flag to handle
  SGML Catalogs as XML format becomes the default.
* Dropped use of getopt in favour of getopts, as the former does not handle       whitespace in variables properly.
* Handle comments in SGML catalogs properly.
* Several manpage improvements.

Changes in the package:
* Implement a new framework to automatically register/deregister catalog
  entries.  This is available through the catalogs.mk file.  Packages do
  not need to call xmlcatmgr directly any more, nor do tricky things in
  their PLISTs.
* Install two catalog files under PKG_SYSCONFDIR, one called sgml/catalog
  and the other xml/catalog.  Both are completely different things, so they
  can't be mixed.  Also avoid that any of these catalogs refer to the other
  one, as this could cause problems.
2003-01-29 20:21:06 +00:00
jlam
d7f69e47ce Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES".  This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile.  Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
2003-01-28 22:03:00 +00:00
jmmv
7188966a27 - Install an additional SGML catalog file under share/sgml/catalog.
- Install a system wide catalog file under PKG_SYSCONFDIR, which now
  becomes the default for the program.
- Bump PKGREVISION to 1.
2003-01-11 21:08:42 +00:00
jmmv
321a488d77 Initial import of xmlcatmgr, version 0.1:
xmlcatmgr is a command line script used to manipulate SGML and XML catalogs.
It is designed with simplicity in mind:  it does not depend on external
programs nor libraries, so it is ideal to manage catalog files from inside
pkgsrc.

XML catalogs are files that contain mappings from public identifiers to
system identifiers.  This allows XML parsers to locate public identifiers
in the local system.
2003-01-10 19:24:48 +00:00