summaryrefslogtreecommitdiff
path: root/textproc/xmlcatmgr
AgeCommit message (Collapse)AuthorFilesLines
2010-01-16Added LICENSE.heinz1-1/+2
2009-06-14Remove @dirrm related logic.joerg3-9/+3
2009-06-14Remove @dirrm entries from PLISTsjoerg1-3/+1
2009-03-20Simply and speed up buildlink3.mk files and processing.joerg1-14/+6
This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
2006-11-03DESTDIR support.joerg1-6/+8
2006-10-12Hmmm, revert previous for the moment. 'make show-var VARNAME=XML_ENTRIES'dsainty1-3/+3
with this change in-place suggests that sometimes the prefix IS added in catalogs.mk (and presumably not in the client package, for some reason).
2006-10-12Don't pretend to automatically add ${PREFIX} to each XML_ENTRIES anddsainty1-3/+3
SGML_ENTRIES entry - it doesn't work. Probably because expansion in this context requires the variable to already be defined, which it isn't. This is lucky, because every package using catalogs.mk adds ${PREFIX} itself to each entry. So usually it gets added just the once. The luck stops if you do something like: make PREFIX=/usr/pkgroot2 This makes the automatic ${PREFIX} insertion suddenly work AS WELL as the client packages adding ${PREFIX} themselves. We end up with /usr/pkgroot2/share/xml/catalog containing lines like: <nextCatalog catalog="/usr/pkgroot2/usr/pkgroot2/share/xml/docbook/4.3/catalog" /> ... after installing textproc/docbook-xml. This in turn causes textproc/scrollkeeper to obscurely fail to build at configure time.
2006-07-08Change the format of BUILDLINK_ORDER to contain depth information as well,jlam1-2/+2
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-08Track information in a new variable BUILDLINK_ORDER that informs usjlam1-1/+2
of the order in which buildlink3.mk files are (recursively) included by a package Makefile.
2006-06-15Pluralize INSTALL_TEMPLATE and DEINSTALL_TEMPLATE variable names as perjlam1-3/+3
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-04-12Aligned the last line of the buildlink3.mk files with the first line, sorillig1-2/+2
that they look nicer.
2006-04-06Over 1200 files touched but no revisions bumped :)reed1-2/+2
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-03-14Modify the pkginstall framework so that it manages all aspects ofjlam1-3/+3
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.
2005-12-29Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mkjlam2-4/+2
automatically detects whether we want the pkginstall machinery to be used by the package Makefile.
2005-12-05Ran "pkglint --autofix", which corrected some of the quoting issues inrillig1-2/+2
CONFIGURE_ARGS.
2005-12-05Fixed pkglint warnings. The warnings are mostly quoting issues, forrillig2-4/+4
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-08-20Use REQD_DIRS instead of MAKE_DIRS for directories under ${PREFIX} sojlam1-2/+3
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-19Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMSjlam1-3/+3
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-05-22Replaced $c with ${c} to make pkglint happy.rillig1-3/+3
2005-05-11Rename mk/bsd.pkg.install.mk to mk/install/bsd.pkginstall.mk tojlam1-2/+3
consolidate the files for that framework in one directory.
2005-04-11Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.tv1-2/+1
2005-03-29Use XMLCATMGR_PREFIX (defined in buildlink3.mk) rather thanjmmv1-3/+3
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-26Use EVAL_PREFIX to determine where xmlcatmgr is installed (instead ofjmmv1-2/+4
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-24Don't check for USE_BUILDLINK3 anymore in these files. These are includedjlam1-4/+2
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-02-24Add RMD160 digests to the SHA1 ones.agc1-1/+2
2004-10-09Increase BUILDLINK_DEPENDS.xmlcatmgr to xmlcatmgr>=2.0beta1reed1-3/+2
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-09-02Some PRINT_PLIST_AWK magic for share/sgml and share/xml.jmmv1-1/+4
2004-09-01Update to 2.2:jmmv3-31/+17
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-07-04Really test CC_VERSION, as previous commit message suggests.wiz1-2/+2
2004-07-03test CC_VERSION instead of USE_MIPSPRO.grant1-3/+3
2004-05-06Quote arguments properly for xmlcatmgr. OK'ed by jmmv@.minskim3-9/+9
2004-05-02Update to 2.1:jmmv3-12/+12
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-04-28Remove support for bl2 since remaining packageswiz2-46/+1
using this have been converted to bl3.
2004-04-27Re-instate for now (catalogs.mk _sets_ USE_BUILDLINK2).wiz1-0/+42
2004-04-26Unused.wiz1-42/+0
2004-04-22The MIPSPro compiler chain needs a "-c99" flag if the code claims tojschauma1-1/+7
be C99 code (for example: use of stdbool.h). This allows this package to build under Irix 6.5 using MIPSPro.
2004-04-12During print-PLIST, print comments and do not remove the catalog files underjmmv1-1/+6
share/(xml|sgml) nor these directories themselves.
2004-03-28Update to 2.0:jmmv2-6/+5
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-05Reorder location and setting of BUILDLINK_PACKAGES to match templatejlam1-7/+10
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-02-01Missing an :M operator on the match for "yes".jlam1-6/+8
2004-02-01Preserve previous behaviour by unconditionally setting USE_BUILDLINK2 ifjlam1-2/+3
we're not already using buildlink3.
2004-02-01Add a buildlink3.mk file for xmlcatmgr and teach catalogs.mk to use thejlam2-3/+47
buildlink3.mk file if USE_BUILDLINK3 is "yes".
2004-01-24Don't force binary package consistency through BUILDLINK_DEPENDS, we nowrh1-2/+3
have BUILDLINK_RECOMMENDED for this.
2004-01-23Update to 2.0beta1:jmmv4-11/+14
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-18Update description according to xmlcatmgr's 2.x branch.jmmv1-8/+8
2004-01-17Update to 2.0alpha2:jmmv3-8/+8
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-07From the log for rev. 1.1260 of bsd.pkg.mk:jlam1-3/+3
"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-05bl3ifyjlam1-2/+4
2003-12-23Enable developer mode (so that assertions are kept). This should be removedjmmv1-1/+2
when the 2.x branch of the program is stabilized.
2003-12-23Update to 2.0alpha1. This is the first version of the development branch.jmmv3-23/+25
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.