pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

basic build ability was established by:

Module Name:	pkgsrc-wip
Committed By:	Matthias Petermann <mp%petermann-it.de@localhost>
Pushed By:	mp
Date:		Sun Mar 8 23:40:46 2020 +0100
Changeset:	255faabadf8e2449d9a51fab59ee673820cac1f2

Modified Files:
	cyrus-imapd30/Makefile
	cyrus-imapd30/TODO
	cyrus-imapd30/options.mk
Removed Files:
	cyrus-imapd30/patches/patch-ac
	cyrus-imapd30/patches/patch-ah
	cyrus-imapd30/patches/patch-ai
	cyrus-imapd30/patches/patch-am
	cyrus-imapd30/patches/patch-ao
	cyrus-imapd30/patches/patch-aq
	cyrus-imapd30/patches/patch-imap_mailbox.c

Log Message:
basic build ability was established by:

- dependencies adjusted
- configure options adjusted
- removed --with-cyrus-group (deprecated)
- removed --with-cyrus-prefix (deprecated)
- removed bdb build option (bdb support dropped in version 3.0.0)
- removed pre-build make depend step
- added http option to configure

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=255faabadf8e2449d9a51fab59ee673820cac1f2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cyrus-imapd30/Makefile                     | 11 +++++-----
 cyrus-imapd30/TODO                         | 16 +++++++++-----
 cyrus-imapd30/options.mk                   | 27 ++++++++++++-----------
 cyrus-imapd30/patches/patch-ac             | 35 ------------------------------
 cyrus-imapd30/patches/patch-ah             | 13 -----------
 cyrus-imapd30/patches/patch-ai             | 13 -----------
 cyrus-imapd30/patches/patch-am             | 19 ----------------
 cyrus-imapd30/patches/patch-ao             | 17 ---------------
 cyrus-imapd30/patches/patch-aq             | 28 ------------------------
 cyrus-imapd30/patches/patch-imap_mailbox.c | 21 ------------------
 10 files changed, 31 insertions(+), 169 deletions(-)

diffs:
diff --git a/cyrus-imapd30/Makefile b/cyrus-imapd30/Makefile
index f2d965b908..01859fb7d7 100644
--- a/cyrus-imapd30/Makefile
+++ b/cyrus-imapd30/Makefile
@@ -14,7 +14,8 @@ COMMENT=	Cyrus IMAP server
 
 MAKE_JOBS_SAFE=	no
 
-USE_TOOLS+=		perl:run makedepend
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		perl:run makedepend yacc pkg-config sed awk gmake
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
@@ -37,8 +38,6 @@ FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP}
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
-CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
-CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-pidfile=${VARBASE}/run/cyrus-master.pid
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
@@ -77,7 +76,7 @@ PERL5_PACKLIST= \
 
 pre-build:
 	${RUN}${_ULIMIT_CMD} \
-	cd ${WRKSRC} && ${BUILD_MAKE_CMD} depend
+#	cd ${WRKSRC} && ${BUILD_MAKE_CMD} depend
 
 .include "../../lang/perl5/module.mk"
 BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.17
@@ -139,4 +138,6 @@ post-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
-.include "../../mk/bsd.pkg.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
\ No newline at end of file
diff --git a/cyrus-imapd30/TODO b/cyrus-imapd30/TODO
index 17bfa68ef0..492a73d3f2 100644
--- a/cyrus-imapd30/TODO
+++ b/cyrus-imapd30/TODO
@@ -6,17 +6,23 @@ suggestions or active support.
 
 Next steps:
 
-1) Make it build the most basic way
+1) Make it build the most basic way [DONE]
 
-2) Evaluation of the patches of the existing Cyrus-imap-pkgs and
+2) Update PLIST (take care of ldap / http options)
+
+3) Evaluation of the patches of the existing Cyrus-imap-pkgs and
    their applicability for cyrus-imap 3
 
-3) Possibly create further patches for cyrus-imap 3 (especially with
+4) Possibly create further patches for cyrus-imap 3 (especially with
    regard to the newly added functions CalDAV / CardDAV), if necessary
 
-4) Review and adjustment of scripts / provided files (configuration
+5) Review and adjustment of scripts / provided files (configuration
    examples, man pages)
 
-5) Fine-tuning of the build
+6) Fine-tuning of the build
 
 For questions, tips or offers of help you can contact me at mp%petermann-it.de@localhost
+
+Bugs:
+
+- Kerberos support, PostgreSQL and MySQL are currently not tested
\ No newline at end of file
diff --git a/cyrus-imapd30/options.mk b/cyrus-imapd30/options.mk
index 1e80f61bc9..f2305766c2 100644
--- a/cyrus-imapd30/options.mk
+++ b/cyrus-imapd30/options.mk
@@ -3,12 +3,12 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
 PKG_SUPPORTED_OPTIONS=	gssapi kerberos kerberos4 ldap pcre snmp
-PKG_SUPPORTED_OPTIONS+=	bdb mysql pgsql sqlite
-PKG_SUGGESTED_OPTIONS=	bdb pcre
+PKG_SUPPORTED_OPTIONS+=	mysql pgsql sqlite http
+PKG_SUGGESTED_OPTIONS=	pcre http
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	ldap
+PLIST_VARS+=	ldap http
 
 .if !empty(PKG_OPTIONS:Mkerberos)
 .  if empty(PKG_OPTIONS:Mgssapi)
@@ -79,16 +79,6 @@ USE_TOOLS+=		perl:run
 CONFIGURE_ARGS+=	--without-snmp
 .endif
 
-.if !empty(PKG_OPTIONS:Mbdb)
-BDB_ACCEPTED=		db3 db4 db5
-.  include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-bdb=${BDB_TYPE}
-CONFIGURE_ARGS+=	--with-bdb-incdir=${BDBBASE}/include/${BDB_TYPE}
-CONFIGURE_ARGS+=	--with-bdb-libdir=${BDBBASE}/lib
-.else
-CONFIGURE_ARGS+=	--without-bdb
-.endif
-
 .if !empty(PKG_OPTIONS:Mmysql)
 .  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
@@ -116,3 +106,14 @@ CONFIGURE_ARGS+=	--enable-pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
+
+.if !empty(PKG_OPTIONS:Mhttp)
+.  include "../../databases/sqlite3/buildlink3.mk"
+.  include "../../textproc/libxml2/buildlink3.mk"
+.  include "../../time/libical/buildlink3.mk"
+CONFIGURE_ARGS+=        --enable-http
+CONFIGURE_ARGS+=        --with-sqlite=${BUILDLINK_PREFIX.sqlite3}
+PLIST.http=		yes
+.else
+CONFIGURE_ARGS+=        --disable-http
+.endif
diff --git a/cyrus-imapd30/patches/patch-ac b/cyrus-imapd30/patches/patch-ac
deleted file mode 100644
index 7512d2a8f6..0000000000
--- a/cyrus-imapd30/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: $
-
---- imap/Makefile.in.orig	2010-10-19 03:08:28.000000000 +0000
-+++ imap/Makefile.in
-@@ -179,6 +179,9 @@ mupdate_err.c: mupdate_err.et
- 
- mupdate_err.h: mupdate_err.c
- 
-+mutex_pthread.o: mutex_pthread.c
-+	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $<
-+
- ### Services
- idled: idled.o idlemsg.o mutex_fake.o libimap.a $(DEPLIBS)
- 	$(CC) $(LDFLAGS) -o idled \
-@@ -213,16 +216,16 @@ imapd.quant: $(IMAPDOBJS) mutex_fake.o l
- 
- mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
- 	libimap.a $(DEPLIBS)
--	$(CC) $(LDFLAGS) -o mupdate \
-+	$(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- 	 mutex_pthread.o tls.o libimap.a \
--	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
--	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
-+	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
- 	$(DEPLIBS) $(SERVICE)
diff --git a/cyrus-imapd30/patches/patch-ah b/cyrus-imapd30/patches/patch-ah
deleted file mode 100644
index f0996c74dc..0000000000
--- a/cyrus-imapd30/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: $
-
---- perl/Makefile.in.orig	2010-10-19 03:08:28.000000000 +0000
-+++ perl/Makefile.in
-@@ -86,7 +86,7 @@ all::
- 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
- 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
--			     $(PERL) Makefile.PL PREFIX=$(prefix); \
-+			     $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
- 			fi; \
- 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- 	done
diff --git a/cyrus-imapd30/patches/patch-ai b/cyrus-imapd30/patches/patch-ai
deleted file mode 100644
index 6ec75d41f8..0000000000
--- a/cyrus-imapd30/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: $
-
---- perl/sieve/Makefile.in.orig	2010-10-19 03:08:28.000000000 +0000
-+++ perl/sieve/Makefile.in
-@@ -86,7 +86,7 @@ all::
- 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
- 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
--			     $(PERL) Makefile.PL PREFIX=$(prefix); \
-+			     $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
- 			fi; \
- 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- 	done
diff --git a/cyrus-imapd30/patches/patch-am b/cyrus-imapd30/patches/patch-am
deleted file mode 100644
index 5654588d80..0000000000
--- a/cyrus-imapd30/patches/patch-am
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: $
-
---- tools/config2header.orig	2010-10-19 03:08:28.000000000 +0000
-+++ tools/config2header
-@@ -79,6 +79,14 @@ while ($#ARGV >= 0) {
- 
- my $use_gcc_extension = ($CC and $CC eq 'gcc');
- 
-+#
-+# Skip any CC options such as -pipe
-+# The last two parameters are the .c and .h files
-+#
-+while ($#ARGV > 1) {
-+	shift @ARGV;
-+}
-+
- die "wrong number of arguments" if ($#ARGV != 1);
- my ($cfile, $hfile) = @ARGV;
- 
diff --git a/cyrus-imapd30/patches/patch-ao b/cyrus-imapd30/patches/patch-ao
deleted file mode 100644
index 96fff81478..0000000000
--- a/cyrus-imapd30/patches/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: $
-
---- imap/imap_err.et.orig	2010-10-19 03:08:28.000000000 +0000
-+++ imap/imap_err.et
-@@ -201,10 +201,10 @@ ec IMAP_NO_MSGGONE,
-    "Message %d no longer exists"
- 
- ec IMAP_NO_CHECKSEEN,
--   "Unable to checkpoint \\Seen state"
-+   "Unable to checkpoint \\\\Seen state"
- 
- ec IMAP_NO_CHECKPRESERVE,
--   "Unable to preserve \\Seen state"
-+   "Unable to preserve \\\\Seen state"
- 
- ec IMAP_NO_NOSUCHMSG,
-    "No matching messages"
diff --git a/cyrus-imapd30/patches/patch-aq b/cyrus-imapd30/patches/patch-aq
deleted file mode 100644
index eebf0bb3ef..0000000000
--- a/cyrus-imapd30/patches/patch-aq
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: $
-
-* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
-  https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
-
---- imap/sync_client.c.orig	2012-12-01 19:57:54.000000000 +0000
-+++ imap/sync_client.c
-@@ -573,7 +573,7 @@ static int folder_unannotation(const cha
- /* ====================================================================== */
- 
- static int sieve_upload(const char *userid, const char *filename,
--			unsigned long last_update)
-+			time_t last_update)
- {
-     const char *cmd = "SIEVE";
-     struct dlist *kl;
-@@ -913,9 +913,9 @@ static void log_record(const char *name,
- 		       struct index_record *record)
- {
-     syslog(LOG_NOTICE, "SYNCNOTICE: %s uid:%u modseq:" MODSEQ_FMT " "
--	  "last_updated:%lu internaldate:%lu flags:(%s)",
-+	  "last_updated:" MODSEQ_FMT " internaldate:" MODSEQ_FMT " flags:(%s)",
- 	   name, record->uid, record->modseq,
--	   record->last_updated, record->internaldate,
-+	   (modseq_t)record->last_updated, (modseq_t)record->internaldate,
- 	   make_flags(mailbox, record));
- }
- 
diff --git a/cyrus-imapd30/patches/patch-imap_mailbox.c b/cyrus-imapd30/patches/patch-imap_mailbox.c
deleted file mode 100644
index 9cff763cec..0000000000
--- a/cyrus-imapd30/patches/patch-imap_mailbox.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: $
-
-* cast to unsigned long for platform sizeof(time_t) > sizeof(unsigned long).
-  https://bugzilla.cyrusimap.org/show_bug.cgi?id=3376
-
---- imap/mailbox.c.orig	2012-12-01 19:57:54.000000000 +0000
-+++ imap/mailbox.c
-@@ -1960,10 +1960,10 @@ bit32 make_sync_crc(struct mailbox *mail
- 	flagcrc ^= crc32_cstring(buf);
-     }
- 
--    snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s",
--	    record->uid, record->modseq, record->last_updated,
-+    snprintf(buf, 4096, "%u " MODSEQ_FMT " " MODSEQ_FMT " (%u) " MODSEQ_FMT " %s",
-+	    record->uid, record->modseq, (modseq_t)record->last_updated,
- 	    flagcrc,
--	    record->internaldate,
-+	    (modseq_t)record->internaldate,
- 	    message_guid_encode(&record->guid));
- 
-     return crc32_cstring(buf);
Home | Main Index | Thread Index | Old Index