Macports: get manpages from generic unix tarball, to avoid huge transitive dependency on xmlto.

3 files changed, 37 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index ee0c0838..66695ed9 100644
--- a/Makefile
+++ b/Makefile
@@ -269,7 +269,9 @@ $(SOURCE_DIR)/%_usage.erl:
 
 docs_all: $(MANPAGES) $(WEB_MANPAGES)
 
-install: all docs_all install_dirs
+install: install_bin install_docs
+
+install_bin: all install_dirs
 	cp -r ebin include LICENSE LICENSE-MPL-RabbitMQ INSTALL $(TARGET_DIR)
 
 	chmod 0755 scripts/*
@@ -277,14 +279,16 @@ install: all docs_all install_dirs
 		cp scripts/$$script $(TARGET_DIR)/sbin; \
 		[ -e $(SBIN_DIR)/$$script ] || ln -s $(SCRIPTS_REL_PATH)/$$script $(SBIN_DIR)/$$script; \
 	done
+	mkdir -p $(TARGET_DIR)/plugins
+	echo Put your .ez plugin files in this directory. > $(TARGET_DIR)/plugins/README
+
+install_docs: docs_all install_dirs
 	for section in 1 5; do \
 		mkdir -p $(MAN_DIR)/man$$section; \
 		for manpage in $(DOCS_DIR)/*.$$section.gz; do \
 			cp $$manpage $(MAN_DIR)/man$$section; \
 		done; \
 	done
-	mkdir -p $(TARGET_DIR)/plugins
-	echo Put your .ez plugin files in this directory. > $(TARGET_DIR)/plugins/README
 
 install_dirs:
 	@ OK=true && \
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile
index 3a22eef0..61a1e910 100644
--- a/packaging/macports/Makefile
+++ b/packaging/macports/Makefile
@@ -1,5 +1,6 @@
 TARBALL_DIR=../../dist
-TARBALL=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz))
+TARBALL_SRC=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz))
+TARBALL_BIN=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-generic-unix-[0-9.]*.tar.gz))
 COMMON_DIR=../common
 VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g')
 
@@ -23,10 +24,15 @@ dirs:
 	mkdir -p $(DEST)/files
 
 $(DEST)/Portfile: Portfile.in
-	for algo in md5 sha1 rmd160 ; do \
-          checksum=$$(openssl $$algo $(TARBALL_DIR)/$(TARBALL) | awk '{print $$NF}') ; \
-	  echo "s|@$$algo@|$$checksum|g" ; \
-	done >checksums.sed
+	tarball_src=$(TARBALL_SRC) ; \
+	tarball_bin=$(TARBALL_BIN) ; \
+	for type in src bin ; do \
+	  tarball_var=tarball_$${type} ; \
+	  tarball=$${!tarball_var} ; \
+	  for algo in md5 sha1 rmd160 ; do \
+            checksum=$$(openssl $$algo $(TARBALL_DIR)/$${tarball} | awk '{print $$NF}') ; \
+	    echo "s|@$$algo-$$type@|$$checksum|g" ; \
+	 done ; done >checksums.sed
 	sed -e "s|@VERSION@|$(VERSION)|g;s|@BASE_URL@|$(REAL_WEB_URL)|g" \
 	    -f checksums.sed <$^ >$@
 	rm checksums.sed
diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index f30460d3..6e67d0cb 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -17,13 +17,19 @@ long_description	\
 homepage        @BASE_URL@
 master_sites    @BASE_URL@releases/rabbitmq-server/v${version}/
 
+distfiles      ${name}-${version}${extract.suffix} \
+               ${name}-generic-unix-${version}${extract.suffix}
+
 checksums \
-    md5 @md5@ \
-    sha1 @sha1@ \
-    rmd160 @rmd160@
+    ${name}-${version}${extract.suffix} md5 @md5-src@ \
+    ${name}-${version}${extract.suffix} sha1 @sha1-src@ \
+    ${name}-${version}${extract.suffix} rmd160 @rmd160-src@ \
+    ${name}-generic-unix-${version}${extract.suffix} md5 @md5-bin@ \
+    ${name}-generic-unix-${version}${extract.suffix} sha1 @sha1-bin@ \
+    ${name}-generic-unix-${version}${extract.suffix} rmd160 @rmd160-bin@
 
 depends_lib	port:erlang
-depends_build	port:xmlto port:libxslt
+depends_build	port:libxslt
 
 platform darwin 7 {
     depends_build-append port:py25-simplejson
@@ -49,11 +55,15 @@ set plistloc ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
 set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
 set wrappersbin ${destroot}${prefix}/sbin
 set realsbin ${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version}/sbin
+set mansrc ${workpath}/rabbitmq_server-${version}/share/man
+set mandest ${destroot}${prefix}/share/man
 
 use_configure   no
 
 use_parallel_build yes
 
+destroot.target install_bin
+
 destroot.destdir \
     TARGET_DIR=${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version} \
     SBIN_DIR=${sbindir} \
@@ -93,6 +103,11 @@ post-destroot {
                 ${wrappersbin}/rabbitmq-multi
     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
+
+    file copy ${mansrc}/man1/rabbitmq-multi.1.gz  ${mandest}/man1/
+    file copy ${mansrc}/man1/rabbitmq-server.1.gz ${mandest}/man1/
+    file copy ${mansrc}/man1/rabbitmqctl.1.gz     ${mandest}/man1/
+    file copy ${mansrc}/man5/rabbitmq.conf.5.gz   ${mandest}/man5/
 }
 
 pre-install {