svn commit: r330764 - in head/mail/mailman: . files

[Matthias Andree]

Author: mandree
Date: Fri Oct 18 18:34:09 2013
New Revision: 330764
URL: http://svnweb.freebsd.org/changeset/ports/330764

Log:
  Distill Python-compileall fix into something fit for shipping upstream,
  and fixing a missed directory component along the way (bumping PORTREVISION).

Added:
  head/mail/mailman/files/patch-Makefile.in   (contents, props changed)
Modified:
  head/mail/mailman/Makefile

Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile	Fri Oct 18 16:42:11 2013	(r330763)
+++ head/mail/mailman/Makefile	Fri Oct 18 18:34:09 2013	(r330764)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.16
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -142,7 +143,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \
 	  ${WRKSRC}/Mailman/Defaults.py.in
 	@${REINPLACE_CMD} -e 's/^0,5,10/#&/' ${WRKSRC}/cron/crontab.in.in
-	@${REINPLACE_CMD} -e '/PYTHON.*compileall/d' ${WRKSRC}/Makefile.in
 .if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e 's/messages//' ${WRKSRC}/Makefile.in
 .endif
@@ -163,12 +163,11 @@ post-install:
 .endfor
 .endif
 	${STRIP_CMD} ${STAGEDIR}${MAILMANDIR}/mail/mailman
-# Recompile Python scripts to get the real paths in,
-# rather than the staged paths:
-.for dir in bin Mailman
+# Compile additional Python scripts:
+.for dir in bin
 	(cd ${STAGEDIR}${MAILMANDIR} \
 	    && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-	    -d ${MAILMANDIR} -f -q ${dir})
+	    -d ${MAILMANDIR}/${dir} ${dir})
 .endfor
 	@${RM} -f ${STAGEDIR}${MAILMANDIR}/pythonlib/*.egg-info
 	@${RM} -f ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.pyc

Added: head/mail/mailman/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/mailman/files/patch-Makefile.in	Fri Oct 18 18:34:09 2013	(r330764)
@@ -0,0 +1,12 @@
+--- ./Makefile.in.orig	2013-10-17 06:11:34.000000000 +0200
++++ ./Makefile.in	2013-10-18 19:18:05.000000000 +0200
+@@ -124,7 +124,8 @@
+ 	do \
+ 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
+ 	done
+-	$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
++	(cd "$(DESTDIR)$(prefix)" \
++	    && $(PYTHON) -c 'from compileall import *; compile_dir("Mailman", ddir="$(prefix)/Mailman")')
+ 
+ # Only run bin/update if we aren't installing in DESTDIR, as this
+ # means there are probably no lists to deal with, and it wouldn't