diff options
author | jmmv <jmmv> | 2003-06-20 10:55:24 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-06-20 10:55:24 +0000 |
commit | 5a30e0dc7eed63a05752bb9d610428624849f4c7 (patch) | |
tree | 9816a72066c6bb9c916edf3b6b8b3729f817d532 /devel | |
parent | d3a7ee36cec8fbf028ceffd7f19cd848ba971fc8 (diff) | |
download | pkgsrc-5a30e0dc7eed63a05752bb9d610428624849f4c7.tar.gz |
Update to 0.1.2alpha6 (named rc6 here):
- Added a "cm truncate" command to truncate an existing branch.
- Added some new consistency checking.
- Bug fixes and speedups.
While here USE_NEW_TEXINFO new framework and refill MESSAGE to 75 columns.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/opencm/MESSAGE | 10 | ||||
-rw-r--r-- | devel/opencm/Makefile | 14 | ||||
-rw-r--r-- | devel/opencm/PLIST | 3 | ||||
-rw-r--r-- | devel/opencm/distinfo | 11 | ||||
-rw-r--r-- | devel/opencm/patches/patch-ac | 10 | ||||
-rw-r--r-- | devel/opencm/patches/patch-ad | 16 | ||||
-rw-r--r-- | devel/opencm/patches/patch-ae | 13 |
7 files changed, 47 insertions, 30 deletions
diff --git a/devel/opencm/MESSAGE b/devel/opencm/MESSAGE index 9f914e31a48..4208558854a 100644 --- a/devel/opencm/MESSAGE +++ b/devel/opencm/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2002/09/09 19:25:53 wiz Exp $ +$NetBSD: MESSAGE,v 1.2 2003/06/20 10:55:24 jmmv Exp $ -OpenCM needs a well configured OpenSSL system to manage user -certificates. You must configure it to make this possible. Check if -you already have a /etc/openssl/openssl.cnf configuration file; if -not, you can copy an example from: +OpenCM needs a well configured OpenSSL system to manage user certificates. +You must configure it to make this possible. Check if you already have a +/etc/openssl/openssl.cnf configuration file; if not, you can copy an +example from: /usr/share/examples/openssl/openssl.cnf diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index 4055813c912..645bf5a0e50 100644 --- a/devel/opencm/Makefile +++ b/devel/opencm/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2003/05/22 16:48:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2003/06/20 10:55:24 jmmv Exp $ # DISTNAME= ${OPENCM_VERSION}-1-src PKGNAME= ${OPENCM_VERSION:C/alpha/rc/} -PKGREVISION= 2 WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base CATEGORIES= devel MASTER_SITES= http://www.opencm.org/releases/ @@ -19,10 +18,14 @@ USE_GMAKE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --infodir=${PREFIX}/info -OPENCM_VERSION= opencm-0.1.2alpha4 +OPENCM_VERSION= opencm-0.1.2alpha6 -CONF_FILES= ${PREFIX}/share/examples/opencm/opencm.conf ${PKG_SYSCONFDIR}/opencm.conf -INFO_FILES= opencm.info +CONF_FILES= ${PREFIX}/share/examples/opencm/opencm.conf \ + ${PKG_SYSCONFDIR}/opencm.conf + +USE_MAKEINFO= yes +USE_NEW_TEXINFO= yes +INFO_FILES= opencm.info CPPFLAGS+= -D__unix__ MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} @@ -33,5 +36,4 @@ MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} .include "../../devel/zlib/buildlink2.mk" .include "../../security/openssl/buildlink2.mk" -.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/opencm/PLIST b/devel/opencm/PLIST index f7894c48969..11df503e4f4 100644 --- a/devel/opencm/PLIST +++ b/devel/opencm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/02/14 22:50:04 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/06/20 10:55:24 jmmv Exp $ bin/cm info/opencm.info.gz share/examples/opencm/opencm.conf @@ -25,6 +25,7 @@ share/opencm/help/mv.help share/opencm/help/note.help share/opencm/help/notes.help share/opencm/help/opt-basic.help +share/opencm/help/opt-debugging.help share/opencm/help/opt-obscure.help share/opencm/help/opt-server.help share/opencm/help/rebind.help diff --git a/devel/opencm/distinfo b/devel/opencm/distinfo index 66f6612759f..642ca047970 100644 --- a/devel/opencm/distinfo +++ b/devel/opencm/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.9 2003/05/06 13:15:05 jmc Exp $ +$NetBSD: distinfo,v 1.10 2003/06/20 10:55:24 jmmv Exp $ -SHA1 (opencm-0.1.2alpha4-1-src.tgz) = 2cbc2d38561a8b9e9deb2097edf1d807c8f0db3a -Size (opencm-0.1.2alpha4-1-src.tgz) = 1387533 bytes +SHA1 (opencm-0.1.2alpha6-1-src.tgz) = c30fc2c0459037869734415926861d7b7e0e575e +Size (opencm-0.1.2alpha6-1-src.tgz) = 1394270 bytes SHA1 (patch-aa) = eccb4254283fa554b33a65a4f93a4a98889cdaaa SHA1 (patch-ab) = 63df5eecf9daedaf0250b4f34f6d48d93a229bfc -SHA1 (patch-ac) = 132b7186f0cf2a3673d7e1b647fa4c81f799f39e -SHA1 (patch-ad) = 7bb9d15d7e5477de5d30e2c8ea7a69c9ce9f59af +SHA1 (patch-ac) = 02434beb61f5f5436d9a8b563344626a6aa98dab +SHA1 (patch-ad) = 2c1d2678355027be4b3abd2fc166d5ddc726a421 +SHA1 (patch-ae) = 6686d43012a6c736a5b5c44e692f7e17631e5cfb SHA1 (patch-af) = 63194a7f9530ccf3ac7f0d91b94d717295c61f0b diff --git a/devel/opencm/patches/patch-ac b/devel/opencm/patches/patch-ac index c8d1c3921a0..e756156a75b 100644 --- a/devel/opencm/patches/patch-ac +++ b/devel/opencm/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2003/02/14 22:50:05 hubertf Exp $ +$NetBSD: patch-ac,v 1.5 2003/06/20 10:55:24 jmmv Exp $ ---- src/Makefile.in.orig Thu Dec 19 20:34:46 2002 +--- src/Makefile.in.orig 2003-06-15 18:50:42.000000000 +0200 +++ src/Makefile.in -@@ -107,8 +107,8 @@ +@@ -110,8 +110,8 @@ CMINCLUDE=@SSL_INC@ # COMREADLINE=-DUSE_READLINE -I/usr/include/readline SESSIONTIMEOUT=-DCLIENT_TIMEOUT=1800 LIBDIFF=$(TOPDIR)/../libgdiff/libgdiff.a @@ -13,12 +13,12 @@ $NetBSD: patch-ac,v 1.4 2003/02/14 22:50:05 hubertf Exp $ XCFLAGS = -Wmissing-prototypes -Wall -Wreturn-type -DDATADIR=\"$(datadir)\" # XCFLAGS += -Wno-unused -Werror -@@ -244,7 +244,7 @@ +@@ -242,7 +242,7 @@ distclean: clean nodepend nodepend: find $(TOPDIR) -name '*.m' -exec rm {} \; -$(OPENCM): $(OBJECTS) $(LIBDIFF) $(LIBZ) $(LIBGC) +$(OPENCM): $(OBJECTS) $(LIBDIFF) - $(CC) -o $(OPENCM) $(CFLAGS) $(OBJECTS) $(LDFLAGS) $(LIBDIFF) $(LIBZ) $(LIBGC) $(LIBS) + $(CC) -o $(OPENCM) $(CFLAGS) $(OBJECTS) $(LDFLAGS) $(CMLDFLAGS) $(LIBDIFF) $(LIBZ) $(LIBGC) $(LIBS) $(CMLIBS) # Whenever we rebuild a .o file, we also need to rebuild the .m file: diff --git a/devel/opencm/patches/patch-ad b/devel/opencm/patches/patch-ad index be2718828fb..f23390dbac4 100644 --- a/devel/opencm/patches/patch-ad +++ b/devel/opencm/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2003/05/06 13:15:06 jmc Exp $ +$NetBSD: patch-ad,v 1.5 2003/06/20 10:55:24 jmmv Exp $ ---- Makefile.in.orig Wed Jan 1 07:52:57 2003 -+++ Makefile.in Tue May 6 00:41:37 2003 -@@ -92,8 +92,8 @@ +--- Makefile.in.orig 2003-06-15 19:09:42.000000000 +0200 ++++ Makefile.in +@@ -92,8 +92,8 @@ datadir = @datadir@ # work robustly when the user messes with --prefix... # Where to put the Info files @@ -13,12 +13,12 @@ $NetBSD: patch-ad,v 1.4 2003/05/06 13:15:06 jmc Exp $ # Where to put the manual pages. sharemandir=$(findstring $(datadir)/man,$(wildcard $(datadir)/*)) -@@ -130,7 +130,7 @@ +@@ -127,7 +127,7 @@ DISTFILES = \ ### Subdirectories to run make in for the primary targets. # Unix source subdirs, where we'll want to run lint and etags: -USOURCE_SUBDIRS = libgdiff gc6.1 zlib src +USOURCE_SUBDIRS = libgdiff src - # All other subdirs: - SUBDIRS = ${USOURCE_SUBDIRS} doc tools etc - + ifeq "@HAVE_MAKEINFO@" "no" + SKIP_DOCS="yes" + endif diff --git a/devel/opencm/patches/patch-ae b/devel/opencm/patches/patch-ae new file mode 100644 index 00000000000..d0acdcd650e --- /dev/null +++ b/devel/opencm/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.3 2003/06/20 10:55:24 jmmv Exp $ + +--- configure.orig 2003-06-20 12:35:34.000000000 +0200 ++++ configure +@@ -1909,7 +1909,7 @@ else + if test ! -d "$dir" ; then + continue; + fi +- if test -f "$dir/include/krb5.h"; then ++ if test -f "$dir/include/krb5/krb5.h"; then + vl_cv_lib_kerberos="$dir" + break; + fi |