On 2009/04/12 21:26, Scott Vokes wrote:
> > # 4-clause BSD
> > just "BSD" will do here.
> The advertising clause does not affect e.g. PACKAGE_CDROM, then?
there are various different 4-clause BSD licenses in use.
this one is just:
4. Except as contained in this notice, the name of David Loren
Parsons shall not be used in advertising or otherwise to promote
the sale, use or other dealings in this Software without prior
written authorization from David Loren Parsons.
absolutely no problem with this one.
the other one that used to be used in the BSD UNIX releases and
was rescinded (and similar forms are, rarely, used in other software)
is this:
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by the University of
California, Berkeley and its contributors."
the closest we possibly come to this is if something is featured in
the "Some highlights" packages list in e.g. 45.html; either way, this
wouldn't affect PACKAGE_CDROM, only the place which mentions it.
> Otherwise, fixed, updated tarball at
> http://shenani.gen.nz/~scott/ports/discount.tgz . Thanks for your
> quick feedback.
there's a warning for every use of the CREATE macro on 64-bit arch
(it's harmless, but makes extra work for people grepping bulk build
output looking for real problems), so I would propose adding the
patch below. also arrange things in Makefile so the regression
tests can be used:
REGRESS_TARGET = test
pre-configure:
@perl -pi -e 's,\./markdown,\./discount,' ${WRKSRC}/tests/*.t
does anyone else have comments? if not i'll commit with these changes
later.
$OpenBSD$
--- cstring.h.orig Fri Apr 3 17:57:34 2009
+++ cstring.h Mon Apr 13 10:39:25 2009
@@ -16,7 +16,7 @@
*/
#define STRING(type) struct { type *text; int size, alloc; }
-#define CREATE(x) T(x) = (void*)(S(x) = (x).alloc = 0)
+#define CREATE(x) T(x) = NULL; (S(x) = (x).alloc = 0)
#define EXPAND(x) (S(x)++)[(S(x) < (x).alloc) \
? (T(x)) \
: (T(x) = T(x) ? realloc(T(x), sizeof T(x)[0] *
((x).alloc += 100)) \
