mk/server.mk: implement ELPA archive including all contrib files - "orgplus"

* mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty
  and upload-eplaplus as copy of respective epla targets, but with all
  files from contrib added.

* .gitignore: Add orgplus EPLA archive to the patterns.

.gitignore

@@ -34,6 +34,7 @@ org-install.el
 org-version.el
 doc/org-version.inc
 org-*.tar*
+orgplus-*.tar*
 org-*.zip
 version.mk
 manual

mk/server.mk

@@ -69,6 +69,23 @@ elpa-dirty:
 elpa-up:	info card elpa-dirty
 	$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
 
+
+elpaplus:		cleanall info card elpaplus-dirty
+elpaplus-dirty elpaplus-up:	ORG_ADD_CONTRIB=org-*
+elpaplus-dirty elpaplus-up:	ORGDIR=orgplus-$(PKG_TAG)
+elpaplus-dirty:
+	@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads
+	-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
+	ln -s . $(ORGDIR)
+	echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
+	  > org-pkg.el
+	tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
+	  $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
+	-@$(RM) $(ORGDIR) org-pkg.el
+	@$(MAKE) cleanlisp
+elpaplus-up:	info card elpaplus-dirty
+	$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
+
 tagwarn:
 	$(if $(filter-out $(ORGVERSION), $(GITVERSION)), \
 	  $(info  ======================================================) \
@@ -93,7 +110,8 @@ doc-up:	info pdf card html
 	$(CP) doc/manual/* $(SERVROOT)/manual
 	$(CP) doc/guide/*  $(SERVROOT)/guide
 
-upload:		cleanall elpa-up rel-up doc-up
-upload-elpa:	cleanall elpa-up
-upload-release:	cleanall rel-up
-upload-doc:	cleanall doc-up
+upload:			cleanall elpa-up rel-up doc-up elpaplus-up
+upload-elpa:		cleanall elpa-up
+upload-elpaplus:	cleanall elpaplus-up
+upload-release:		cleanall rel-up
+upload-doc:		cleanall doc-up