Date: Sun, 12 Oct 2003 00:59:04 -0400 (EDT) From: Scott Lambert <lambert@lambertfam.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Scott Lambert <lambert@lambertfam.org> Subject: ports/57877: Update port: mail/mailman add option for using the htdig integration patches Message-ID: <20031012045904.39442599F@DellBSD.inch.com> Resent-Message-ID: <200310120500.h9C50ZIF093902@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57877 >Category: ports >Synopsis: Update port: mail/mailman add option for using the htdig integration patches >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 11 22:00:32 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Scott Lambert >Release: FreeBSD 4.8-RELEASE-p13 i386 >Organization: The Internet Channel, www.inch.com, New York, NY >Environment: System: FreeBSD www.lambertfam.org 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #3: Mon Oct 6 13:25:48 EDT 2003 root@www.lambertfam.org:/usr/obj/usr/src/sys/DELLBSD i386 >Description: Update to mail/mailman to add an option (WITH_HTDIG) to patch mailman with the htdig integration patches. Using DIST_SUBDIR because of the funkyness of the patch names. Did not bump PORTREVISION. The default built binaries are unchanged in functionality. Upon further reading of the Porter's Handbook, I probably should have bumped it. In the end, I have decided to err on the side of caution. The original pkg-plist had some items that did not match the overall sorting of the file. Those into line with this patch. The original pkg-plist had both an entry for @dirrm %%MMDIR%%/Mailman and @unexec rmdir %D/%%MMDIR%%/Mailman 2>/dev/null || true This patch removes the @dirrm line. For complete consistency, we should add an @exec mkdir -p %%MMDIR%%/Mailman to the pkg-plist file, but I don't think it's necessary. I have doubts that several of the "@exec mkdir -p" lines are necessary. I lack ports-foo so have not attempted to get rid of them. 00:34:17 Sun Oct 12 $ portlint OK: checking /usr/ports/local_ports/mailman/pkg-descr. OK: checking Makefile. WARN: extra item placed in the PATCH_SITES section. WARN: extra item placed in the *_DEPENDS section. OK: checking /usr/ports/local_ports/mailman/distinfo. OK: checking /usr/ports/local_ports/mailman/files/patch-Mailman::Defaults.py.in. OK: checking /usr/ports/local_ports/mailman/files/patch-Mailman::htmlformat.py. OK: checking /usr/ports/local_ports/mailman/files/patch-README.EXIM. OK: checking /usr/ports/local_ports/mailman/files/patch-misc::mailman.in. 0 fatal errors and 2 warnings found. I don't know how to get rid of the 2 warnings. >How-To-Repeat: >Fix: diff -ru mail/mailman/Makefile local_ports/mailman/Makefile --- mail/mailman/Makefile Tue Sep 30 03:06:18 2003 +++ local_ports/mailman/Makefile Sun Oct 12 00:23:24 2003 @@ -12,7 +12,20 @@ ${MASTER_SITE_GNU} \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mailman +.if defined(WITH_HTDIG) +PKGNAMESUFFIX= -with-htdig +.endif EXTRACT_SUFX= .tgz +DIST_SUBDIR= mailman + +.if defined(WITH_HTDIG) +# Order of application of these patches is critical. +PATCHFILES= download.php\?group_id=103\&atid=300103\&file_id=63029\&aid=444879:patch1 \ + htdig-2.1.3-0.3.patch.gz:patch2 +PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://sourceforge.net/tracker/:patch1 \ + http://www.openinfo.co.uk/mailman/patches/444884/:patch2 +.endif MAINTAINER= vivek@khera.org COMMENT= A mailing list manager (MLM) with a user-friendly web front-end @@ -21,6 +34,9 @@ .if defined(WITH_CHINESE) RUN_DEPENDS+= ${PYTHONPREFIX_SITELIBDIR}/cjkcodecs.pth:${PORTSDIR}/converters/py-cjkcodecs .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif HAS_CONFIGURE= yes USE_PYTHON= yes @@ -29,6 +45,12 @@ --with-username=${MM_USERNAME} \ --with-groupname=${MM_GROUPNAME} \ --with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID} + +.if defined(WITH_HTDIG) +PLIST_SUB+= SUB_HTDIG="" +.else +PLIST_SUB+= SUB_HTDIG="@comment " +.endif .include <bsd.port.pre.mk> diff -ru mail/mailman/distinfo local_ports/mailman/distinfo --- mail/mailman/distinfo Tue Sep 30 03:06:18 2003 +++ local_ports/mailman/distinfo Sat Oct 11 12:28:40 2003 @@ -1 +1,3 @@ -MD5 (mailman-2.1.3.tgz) = 1c9ec97b340ad1f802bce3f6b2dd9430 +MD5 (mailman/mailman-2.1.3.tgz) = 1c9ec97b340ad1f802bce3f6b2dd9430 +MD5 (mailman/download.php?group_id=103&atid=300103&file_id=63029&aid=444879) = f2b110c6be38f5aebee95a1119cd6e74 +MD5 (mailman/htdig-2.1.3-0.3.patch.gz) = 1a4135f81fef3f1c83308b7a843cfda3 diff -ru mail/mailman/files/pkg-opts local_ports/mailman/files/pkg-opts --- mail/mailman/files/pkg-opts Fri Sep 5 03:06:41 2003 +++ local_ports/mailman/files/pkg-opts Thu Oct 9 17:45:51 2003 @@ -53,3 +53,6 @@ * WITH_CHINESE [undefined] Define to include support for Chinese mailing lists +* WITH_HTDIG [undefined] + Define to include the htdig integration patches. + diff -ru mail/mailman/pkg-plist local_ports/mailman/pkg-plist --- mail/mailman/pkg-plist Tue Sep 30 03:06:18 2003 +++ local_ports/mailman/pkg-plist Sun Oct 12 00:20:47 2003 @@ -1,8 +1,9 @@ @unexec if cmp -s %D/%%MMDIR%%/Mailman/mm_cfg.py %D/%%MMDIR%%/Mailman/mm_cfg.py.dist; then rm -f %D/%%MMDIR%%/Mailman/mm_cfg.py; fi @unexec rm -f %D/%%MMDIR%%/Mailman/mm_cfg.pyc +@exec mkdir -p %D/%%MMDIR%%/archives +%%SUB_HTDIG%%@exec mkdir -p %D/%%MMDIR%%/archives/htdig @exec mkdir -p %D/%%MMDIR%%/archives/private @exec mkdir -p %D/%%MMDIR%%/archives/public -@exec mkdir -p %D/%%MMDIR%%/archives @exec mkdir -p %D/%%MMDIR%%/lists @exec mkdir -p %D/%%MMDIR%%/locks @exec mkdir -p %D/%%MMDIR%%/logs @@ -78,8 +79,12 @@ %%MMDIR%%/Mailman/Cgi/create.pyc %%MMDIR%%/Mailman/Cgi/edithtml.py %%MMDIR%%/Mailman/Cgi/edithtml.pyc +%%SUB_HTDIG%%%%MMDIR%%/Mailman/Cgi/htdig.py +%%SUB_HTDIG%%%%MMDIR%%/Mailman/Cgi/htdig.pyc %%MMDIR%%/Mailman/Cgi/listinfo.py %%MMDIR%%/Mailman/Cgi/listinfo.pyc +%%SUB_HTDIG%%%%MMDIR%%/Mailman/Cgi/mmsearch.py +%%SUB_HTDIG%%%%MMDIR%%/Mailman/Cgi/mmsearch.pyc %%MMDIR%%/Mailman/Cgi/options.py %%MMDIR%%/Mailman/Cgi/options.pyc %%MMDIR%%/Mailman/Cgi/private.py @@ -305,6 +310,7 @@ %%MMDIR%%/bin/add_members %%MMDIR%%/bin/arch %%MMDIR%%/bin/b4b5-archfix +%%SUB_HTDIG%%%%MMDIR%%/bin/blow_away_htdig %%MMDIR%%/bin/change_pw %%MMDIR%%/bin/check_db %%MMDIR%%/bin/check_perms @@ -331,8 +337,8 @@ %%MMDIR%%/bin/qrunner %%MMDIR%%/bin/remove_members %%MMDIR%%/bin/rmlist -%%MMDIR%%/bin/sync_members %%MMDIR%%/bin/show_qfiles +%%MMDIR%%/bin/sync_members %%MMDIR%%/bin/transcheck %%MMDIR%%/bin/unshunt %%MMDIR%%/bin/update @@ -343,7 +349,9 @@ %%MMDIR%%/cgi-bin/confirm %%MMDIR%%/cgi-bin/create %%MMDIR%%/cgi-bin/edithtml +%%SUB_HTDIG%%%%MMDIR%%/cgi-bin/htdig %%MMDIR%%/cgi-bin/listinfo +%%SUB_HTDIG%%%%MMDIR%%/cgi-bin/mmsearch %%MMDIR%%/cgi-bin/options %%MMDIR%%/cgi-bin/private %%MMDIR%%/cgi-bin/rmlist @@ -356,8 +364,12 @@ %%MMDIR%%/cron/gate_news %%MMDIR%%/cron/mailpasswds %%MMDIR%%/cron/nightly_gzip +%%SUB_HTDIG%%%%MMDIR%%/cron/nightly_htdig %%MMDIR%%/cron/paths.py %%MMDIR%%/cron/paths.pyc +%%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig +%%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig.pl +%%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig_noshare %%MMDIR%%/cron/senddigests %%MMDIR%%/data/last_mailman_version %%MMDIR%%/data/sitelist.cfg @@ -374,14 +386,14 @@ %%MMDIR%%/messages/de/LC_MESSAGES/mailman.mo %%MMDIR%%/messages/de/LC_MESSAGES/mailman.po %%MMDIR%%/messages/de/README.de -%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.mo -%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.po -%%MMDIR%%/messages/eu/README.eu %%MMDIR%%/messages/es/LC_MESSAGES/mailman.mo %%MMDIR%%/messages/es/LC_MESSAGES/mailman.po %%MMDIR%%/messages/es/README.es %%MMDIR%%/messages/et/LC_MESSAGES/mailman.mo %%MMDIR%%/messages/et/LC_MESSAGES/mailman.po +%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.mo +%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.po +%%MMDIR%%/messages/eu/README.eu %%MMDIR%%/messages/fi/LC_MESSAGES/mailman.mo %%MMDIR%%/messages/fi/LC_MESSAGES/mailman.po %%MMDIR%%/messages/fi/README.fi @@ -693,6 +705,7 @@ %%MMDIR%%/templates/de/unsub.txt %%MMDIR%%/templates/de/userpass.txt %%MMDIR%%/templates/de/verify.txt +%%SUB_HTDIG%%%%MMDIR%%/templates/en/TOC_htsearch.html %%MMDIR%%/templates/en/admindbdetails.html %%MMDIR%%/templates/en/admindbpreamble.html %%MMDIR%%/templates/en/admindbsummary.html @@ -716,6 +729,9 @@ %%MMDIR%%/templates/en/emptyarchive.html %%MMDIR%%/templates/en/headfoot.html %%MMDIR%%/templates/en/help.txt +%%SUB_HTDIG%%%%MMDIR%%/templates/en/htdig_access_error.html +%%SUB_HTDIG%%%%MMDIR%%/templates/en/htdig_auth_failure.html +%%SUB_HTDIG%%%%MMDIR%%/templates/en/htdig_conf.txt %%MMDIR%%/templates/en/invite.txt %%MMDIR%%/templates/en/listinfo.html %%MMDIR%%/templates/en/masthead.txt @@ -1667,10 +1683,10 @@ @dirrm %%MMDIR%%/messages/fr @dirrm %%MMDIR%%/messages/fi/LC_MESSAGES @dirrm %%MMDIR%%/messages/fi -@dirrm %%MMDIR%%/messages/et/LC_MESSAGES -@dirrm %%MMDIR%%/messages/et @dirrm %%MMDIR%%/messages/eu/LC_MESSAGES @dirrm %%MMDIR%%/messages/eu +@dirrm %%MMDIR%%/messages/et/LC_MESSAGES +@dirrm %%MMDIR%%/messages/et @dirrm %%MMDIR%%/messages/es/LC_MESSAGES @dirrm %%MMDIR%%/messages/es @dirrm %%MMDIR%%/messages/de/LC_MESSAGES @@ -1694,7 +1710,6 @@ @dirrm %%MMDIR%%/Mailman/Cgi @dirrm %%MMDIR%%/Mailman/Bouncers @dirrm %%MMDIR%%/Mailman/Archiver -@dirrm %%MMDIR%%/Mailman %%PORTDOCS%%@dirrm share/doc/mailman @unexec rmdir %D/%%MMDIR%%/spam 2>/dev/null || true @unexec rmdir %D/%%MMDIR%%/qfiles 2>/dev/null || true @@ -1704,6 +1719,7 @@ @unexec rmdir %D/%%MMDIR%%/data 2>/dev/null || true @unexec rmdir %D/%%MMDIR%%/archives/public 2>/dev/null || true @unexec rmdir %D/%%MMDIR%%/archives/private 2>/dev/null || true +%%SUB_HTDIG%%@unexec rmdir %D/%%MMDIR%%/archives/htdig 2>/dev/null || true @unexec rmdir %D/%%MMDIR%%/archives 2>/dev/null || true @unexec rmdir %D/%%MMDIR%%/Mailman 2>/dev/null || true @unexec rmdir %D/%%MMDIR%%/ 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031012045904.39442599F>