pkglint --only "https instead of http" -r -F
With manual adjustments afterwards since pkglint 19.4.4 fixed a few
indentations in unrelated lines.
This mainly affects projects hosted at SourceForce, as well as
freedesktop.org, CTAN and GNU.
The actual fix as been done by "pkglint -F */*/buildlink3.mk", and was
reviewed manually.
There are some .include lines that still are indented with zero spaces
although the surrounding .if is indented. This is existing practice.
Problems found with existing digests:
Package fotoxx distfile fotoxx-14.03.1.tar.gz
ac2033f87de2c23941261f7c50160cddf872c110 [recorded]
118e98a8cc0414676b3c4d37b8df407c28a1407c [calculated]
Package ploticus-examples distfile ploticus-2.00/plnode200.tar.gz
34274a03d0c41fae5690633663e3d4114b9d7a6d [recorded]
da39a3ee5e6b4b0d3255bfef95601890afd80709 [calculated]
Problems found locating distfiles:
Package AfterShotPro: missing distfile AfterShotPro-1.1.0.30/AfterShotPro_i386.deb
Package pgraf: missing distfile pgraf-20010131.tar.gz
Package qvplay: missing distfile qvplay-0.95.tar.gz
Otherwise, existing SHA1 digests verified and found to be the same on
the machine holding the existing distfiles (morden). All existing
SHA1 digests retained for now as an audit trail.
libXext/buildlink3.mk, now that it is included there.
Leave the places where its API version is set or variables from it
are used directly (about 3 packages).
Version 2.6 released, 9/2009. [Includes libplot 4.4, interface age=2.]
ode: File ode/specfun.c now heavily rewritten to remove all non-GNU
copyrights. For details, see the file ./COMPAT.
libplot: Several bugfixes to the SVG and PS drivers. (Thanks to Diomidis
Spinellis, James Anderson, and others, for pointing out that
several apps that import SVG or PS were choking on libplot's
output. Some still choke on its SVG output, but that's no longer
libplot's fault; see ./COMPAT.)
libplot: The SVG driver now no longer assumes that the application that
imports or displays SVG can do _any_ justification of text strings
(not even horizontal justification, e.g., position a string in a
right-justified way, with its right edge at a given point). Many
SVG viewers still get this wrong.
libplot: Fig plotters now slightly increase the width of drawn lines,
in .fig output, to agree with the interpretation of `line width'
in recent releases of xfig. (Thanks to Wolfgang Glunz and
Bart De Schutter for pointing out the need for this.) This
affects executables built with libplot, such as `graph -Tfig'.
graph,plot,tek2plot,plotfont,pic2plot,hersheydemo: The output of the
`--help' option now cautions that if a `-T' or `--output-format'
command-line option is not included, the output will by default
be in the `metafile' format, which is probably not what the user
expects or wants (by default, it is in binary).
hersheydemo: New executable, generating a single demo page that serves
as an advertisement for the Hershey vector fonts. (It replaces
the file doc/h-demo.c.) Invoke it by doing, e.g.,
`hersheydemo -Tsvg > demo.svg' , or `hersheydemo -Tps | lpr' .
It supports the usual libplot options such as --bg-color,
--pen-color, and --page-size. Also --bitmap-size, if a bitmap
output format is requested; but note that the Hershey fonts, not
being anti-aliased, do not look their best in low-resolution
(i.e., small-size) bitmap output.
Version 2.5.1 released, 7/2008. [Includes libplot 4.3, interface age=2.]
package: license for the package (and for libplot) upgraded to GNU GPL v3.
libplot: SVG output format slightly tweaked, to ensure compatability with
SVG 1.1 syntax, as tested for by validator.w3.org.
Note: a few SVG editing tools, such as inkscape, currently fail
to agree with libplot's SVG semantics, in positioning text.
That appears to be their fault (they do not comply with the
handling of reflected text, as specified in the SVG 1.1 standard).
libplot: Fixed a bug in bounding box computatations when triangular
line-joins are used.
executables: Changed nearly all warning and error messages to complete
sentences, to smooth the upcoming transition to gettext.
Version 2.5 released, 12/2005. [Includes libplot 4.2, interface age=2.]
package: bug reporting address has changed to bug-plotutils@gnu.org.
libplot: support for rotated and sheared (i.e., "anamorphically
transformed") X Window System fonts has been completely rewritten.
Core X fonts are still used, but it is no longer assumed that the
X display has the ability to rasterize rotated and sheared glyphs.
(Recent releases of XFree86 are broken in this regard.) Instead,
unrotated glyphs are retrieved from the server, and rotated or
transformed within libplot. See new module libplot/x_afftext.c.
graph: plotting of rotated y-axis labels by the `-Y' option, when `-T X' is
specified (so that output is to an X Window System display) should
now work, even when recent broken releases of XFree86 are used.
This is due to the above change to libplot.
libplot: URW versions of the standard 35 Adobe fonts (Helvetica,
Times-Roman etc.) are now checked for under their own names on any
X Window System display, as well as under the Adobe names. This
fixes a problem with recent SuSE GNU/Linux distributions, of
`graph -T X' being unable to use even the default Helvetica font.
libplot: SVG output is now conformant SVG 1.1, and should not be rejected
by the Firefox browser.
libplot: vertical positioning of text strings by the SVG driver is
improved; libplot now does vertical positioning itself, since
many SVG renderers, e.g. Firefox 1.5, can't do it properly.
libplot: the ROTATION parameter, which is the angle in degrees at which the
viewport in the output (device) frame should be rotated, can now
take values other than 0, 90, 180, and 270.
graph,plot,tek2plot,plotfont,pic2plot: the --rotation option no longer
requires that the specified angle be 0, 90, 180, or 270 degrees.
Some quite postmodern effects can now be obtained.
libplot: modifiers such as "xsize=6in", "yoffset=8cm" appended to the
PAGESIZE parameter by the user, to do fine positioning of the
viewport on the output page, are no longer sometimes ignored.
graph,plot,tek2plot,plotfont,pic2plot: modifiers such as "xsize=6in",
"yoffset=8cm" appended to the argument of the --page-size option,
by the user, to do fine positioning of the viewport on the output
page, are no longer sometimes ignored.
libplotter,pic2plot: problems with compilation by recent C++ compilers now
fixed: unsigned char* is cast to char* as needed, deprecated C++
headers have had their names modernized, etc. Support for `bool'
in the C++ compiler is now assumed (this could be trivially backed
out of, if needed).
installation: entire package can now be compiled by a C++ compiler if
desired; request this by doing e.g. `CC=g++ ./configure'.
installation: support for pre-ANSI C compilers, such the SunOS 4.1.3 one,
now largely dropped. Non-working `const' is still checked for,
but compiler support for prototypes and void is now assumed.
Removal of preprocessor macros that supported pre-ANSI C, from
many source files, considerably improved maintainability.
installation: updated GNU autotools now used (autoconf-2.59, libtool-1.5.6,
and the older automake-1.4-p6 for safety's sake). Also, recent
flex/bison have been used to prepare the scanner and parser supplied
with the ode source (flex-2.5.31 and bison-1.875d).
graph: new short `-Q' option, which is equivalent to the long option
`--toggle-rotate-y-axis-label'.
graph,plot,tek2plot,plotfont,pic2plot: `--display-type' long option, the
name of which confused some users, has been changed to
`--output-format'. The old option is still supported but is now
deprecated. The short option `-T' continues to work.
libplot: problems with PS output triggering an error in some versions of
ghostscript (and hence ghostview, gv), due to changes in the way
ghostscript handles FontBBox, now fixed. Thanks, Brian Gough (and
also Alex Cherepanov, who found the fix to idraw's PS prologue).
libplot: most external symbols not meant to be publicly accessible now have
names beginning with the prefix "_pl_", to reduce the possibility
of namespace collisions. This will be completed in a later release.
executables: output of "--help" has been altered to agree with current GNU
coding standards.
package: copyright and license notices added to nearly all source files.
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.
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
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).
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
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.
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".
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.
(alternatively, we could have renamed one to '<pkgname>-x11', but for the
element of least surprise, the default remains x11 enabled).
This will work much better than the previous attempt to build two packages
from one Makefile, which wasn't all thought out wrt to dependencies, buildlinks etc.
Bump PKGREVISION on plotutils and gnuplot for this.
