Clean up 'cclient' component

- Clean up patch, mainly to not hardcode the fact that the recipe
  uses __compile__ suffix for build directory.
- Do not install *.o; install executables in bin/
- The URL didn't work anymore: switch to another one.

component/cclient/buildout.cfg

@@ -10,7 +10,9 @@ parts =
 
 [cclient]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
+#url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
+url = https://src.fedoraproject.org/lookaside/pkgs/uw-imap/${:filename}/${:md5sum}/${:filename}
+filename = imap-2007f.tar.gz
 md5sum = 2126fd125ea26b73b20f01fcd5940369
 configure-command = true
 # cclient does not support parallel compilation
@@ -23,11 +25,11 @@ make-options =
   SSLLIB=${openssl:location}/lib
   EXTRACFLAGS=-fPIC
   EXTRALDFLAGS="-Wl,-rpath -Wl,${openssl:location}/lib"
-  CCLIENT=${buildout:parts-directory}
+  PREFIX=%(location)s
   -j1
 
 patches =
-  ${:_profile_base_location_}/imap-2007f.patch#42c77fdd5d7a976fc302b93aadb3da98
+  ${:_profile_base_location_}/imap-2007f.patch#5d1f2f95472f6be465ef7e152a011100
   ${:_profile_base_location_}/imap-2007f-openssl-1.1.patch#c726354e888f2f3b3954e334903cef80
 
 patch-options = -p1

component/cclient/imap-2007f.patch

---- old/Makefile	2011-09-22 13:19:53.000000000 +0100
-+++ new/Makefile	2011-11-09 15:02:54.038306922 +0100
-@@ -280,7 +280,11 @@
+diff -u old/Makefile new/Makefile
+--- old/Makefile
++++ new/Makefile
+@@ -280,6 +280,7 @@
  SYSTEM=unix
  TOOLS=tools
  TOUCH=touch
--
-+IMAPDIR=$(CCLIENT)/cclient
-+COMPILEDIR = $(CCLIENT)/cclient__compile__/imap-2007f
-+CP=cp -r
 +INSTALL=install
-+FOR=for
  
- # Primary build command
  
-@@ -580,7 +584,6 @@
+ # Primary build command
+@@ -580,7 +581,6 @@
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  	@echo
  	@echo Do you want to continue this build anyway?  Type y or n please:
@@ -21,36 +17,26 @@
  
  nounenc:
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -639,7 +642,7 @@
+@@ -639,7 +639,6 @@
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  	@echo
  	@echo Do you want to build with IPv6 anyway?  Type y or n please:
 -	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make noip6;exit 1);; esac'
-+	#@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make noip6;exit 1);; esac'
  	@echo OK, I will remember that you really want to build with IPv6.
  	@echo You will not see this message again.
  	@$(TOUCH) ip6
-@@ -731,6 +734,24 @@
+@@ -731,6 +730,15 @@
  	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
  	$(CD) tools;$(MAKE) clean
  
-+install:	
-+	$(INSTALL) -v -d $(IMAPDIR)/include
-+	$(INSTALL) -v -d $(IMAPDIR)/lib
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/*.h $(IMAPDIR)/include
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/c-client.a $(IMAPDIR)/lib
-+	$(CP) $(COMPILEDIR)/ipopd $(COMPILEDIR)/mailutil $(COMPILEDIR)/imapd \
-+	$(COMPILEDIR)/dmail $(COMPILEDIR)/mlock $(COMPILEDIR)/mtest $(COMPILEDIR)/tmail $(IMAPDIR)
-+	$(RM) $(IMAPDIR)/ipopd/*.h $(IMAPDIR)/ipopd/*.c $(IMAPDIR)/ipopd/Makefile;
-+	$(RM) $(IMAPDIR)/mailutil/*.h $(IMAPDIR)/mailutil/*.c $(IMAPDIR)/mailutil/Makefile;
-+	$(RM) $(IMAPDIR)/imapd/*.h $(IMAPDIR)/imapd/*.c $(IMAPDIR)/imapd/Makefile;
-+	$(RM) $(IMAPDIR)/tmail/*.h $(IMAPDIR)/tmail/*.c $(IMAPDIR)/tmail/Makefile;
-+	$(RM) $(IMAPDIR)/mlock/*.h $(IMAPDIR)/mlock/*.c $(IMAPDIR)/mlock/Makefile;
-+	$(RM) $(IMAPDIR)/mtest/*.h $(IMAPDIR)/mtest/*.c $(IMAPDIR)/mtest/Makefile;
-+	$(RM) $(IMAPDIR)/dmail/*.h $(IMAPDIR)/dmail/*.c $(IMAPDIR)/dmail/Makefile;
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/ip6 $(IMAPDIR)
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/OSTYPE $(IMAPDIR)
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/SPECIALS $(IMAPDIR)
++install:
++	$(INSTALL) -v -d $(PREFIX)/bin $(PREFIX)/include $(PREFIX)/lib
++	$(INSTALL) -v c-client/*.h $(PREFIX)/include
++	$(INSTALL) -v c-client/c-client.a $(PREFIX)/lib
++	for x in ipopd mailutil imapd dmail mlock mtest tmail; \
++	do for x in $$x/*; do [ ! -x $$x ] || echo $$x; done; \
++	done |xargs $(INSTALL) -v -t $(PREFIX)/bin
++	$(INSTALL) -v -t $(PREFIX) ip6 OSTYPE SPECIALS
 +
  
  # A monument to a hack of long ago and far away...