From d68dd1822dfd2c7efc8e46cd23483488f3cbac04 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 6 Jun 2018 15:13:40 -0400
Subject: [PATCH] Removed obsolete mkdirs from Makefile

---
 citadel/Makefile.in | 10 +++-----
 citadel/citadel.h   |  2 +-
 webcit/ical_subst.c | 58 ---------------------------------------------
 3 files changed, 4 insertions(+), 66 deletions(-)

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index cc27334d0..e8a3524d8 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -206,7 +206,7 @@ upgrade: install-exec install-doc
 	@echo
 
 install-data:
-	@for i in messages network/spoolin ; do
+	@for i in messages ; do
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
 	@for i in public_clients citadel_urlshorteners.rc \
@@ -220,9 +220,6 @@ install-data:
 	fi
 
 install-data-new:
-	@for i in network/spoolin network/systems; do \
-		$(srcdir)/mkinstalldirs $(DESTDIR)$(RUN_DIR)/$$i; \
-	done
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
 	$(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
 	$(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc
@@ -234,12 +231,11 @@ install-data-new:
 		echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
 	done
-	$(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
 	-@if test -d $(DESTDIR)/etc/pam.d; then \
 		echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 		$(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
 	fi
-	@for i in bio files images info userpics; do \
+	@for i in files; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
 	done
 
@@ -271,7 +267,7 @@ install-doc-new:
 	$(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-	@for i in bio files images info userpics; do \
+	@for i in files; do \
 		$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
 	done
 	@for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
diff --git a/citadel/citadel.h b/citadel/citadel.h
index 683b1c8f9..aa108c30c 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -35,7 +35,7 @@ extern "C" {
  */
 #define CITADEL	PACKAGE_STRING
 
-#define REV_LEVEL	920		// This version
+#define REV_LEVEL	921		// This version
 #define REV_MIN		591		// Oldest compatible database
 #define EXPORT_REV_MIN	760		// Oldest compatible export files
 #define LIBCITADEL_MIN	920		// Minimum required version of libcitadel
diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index 420b2e71f..adb923882 100644
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -22,64 +22,6 @@ CtxType CTX_ICALMETHOD = CTX_NONE;
 CtxType CTX_ICALTIME = CTX_NONE;
 CtxType CTX_ICALATTENDEE = CTX_NONE;
 CtxType CTX_ICALCONFLICT = CTX_NONE;
-#if 0
-void SortPregetMatter(HashList *Cals)
-{
-	disp_cal *Cal;
-	void *vCal;
-	const char *Key;
-        long KLen;
-	IcalEnumMap *SortMap[10];
-	IcalEnumMap *Map;
-	void *vSort;
-	const char *Next = NULL;
-	const StrBuf *SortVector;
-	StrBuf *SortBy;
-	int i = 0;
-	HashPos *It;
-
-	SortVector = SBSTR("ICALSortVec");
-	if (SortVector == NULL)
-		return;
-
-	for (i = 0; i < 10; i++) SortMap[i] = NULL;
-	SortBy = NewStrBuf();
-	while (StrBufExtract_NextToken(SortBy, SortVector, &Next, ':') > 0) {
-		GetHash(IcalComponentMap, SKEY(SortBy), &vSort);
-		Map = (IcalEnumMap*) vSort;
-		SortMap[i] = Map;
-		i++;
-		if (i > 9)
-			break;
-	}
-
-	if (i == 0)
-		return;
-
-	switch (SortMap[i - 1]->map) {
-		/*	case */
-
-	default:
-		break;
-	}
-
-	It = GetNewHashPos(Cals, 0);
-	while (GetNextHashPos(Cals, It, &KLen, &Key, &vCal)) {
-		i = 0;
-		Cal = (disp_cal*) vCal;
-		Cal->Status = icalcomponent_get_status(Cal->cal);
-		Cal->SortBy = Cal->cal;
-		
-
-		while ((SortMap[i] != NULL) && 
-		       (Cal->SortBy != NULL)) 
-		{
-			/****Cal->SortBy = icalcomponent_get_first_property(Cal->SortBy, SortMap[i++]->map); */
-		}
-	}
-}
-#endif
-
 
 void tmplput_ICalItem(StrBuf *Target, WCTemplputParams *TP)
 {
-- 
2.30.2