From cc523c6fc74b5595766f1c9d1070b7240b313e4e Mon Sep 17 00:00:00 2001 From: Greg Larkin Date: Thu, 7 Aug 2008 17:56:37 +0000 Subject: [PATCH] - Take maintainership - Upgrade to 0.444 (PR is now moot due to upstream fix) - Stylistic fixes to Makefile - Add OPTIONS - Remove djb-related RESTRICTED (see http://cr.yp.to/distributors.html) PR: ports/121635 Submitted By: Paul Reece Approved By: beech (mentor, implicit) --- mail/ezmlm-idx/Makefile | 48 +++++++++---------- mail/ezmlm-idx/distinfo | 9 ++-- .../{pkg-message => files/pkg-message.in} | 6 ++- mail/ezmlm-idx/pkg-descr | 9 ++-- 4 files changed, 34 insertions(+), 38 deletions(-) rename mail/ezmlm-idx/{pkg-message => files/pkg-message.in} (55%) diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index 34f78e73c597..b098c6a9190a 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -6,20 +6,16 @@ # PORTNAME= ezmlm-idx -PORTVERSION= 0.40 -PORTREVISION= 4 +PORTVERSION= 0.444 CATEGORIES= mail -MASTER_SITES= ftp://ftp.ezmlm.org/pub/patches/ \ - ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \ - http://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \ - ftp://ftp.eos.hokudai.ac.jp/pub/mail/ezmlm/ +MASTER_SITES= http://www.ezmlm.org/archive/${PORTVERSION}/ \ + http://ezmlm.sericyb.com.au/archive/${PORTVERSION}/ \ + http://cr.yp.to/software/ \ + http://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ezmlm-${EZMLM_VERSION}${EXTRACT_SUFX} -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= ezmlm-cgi.patch - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= glarkin@FreeBSD.org COMMENT= Improved version of the ezmlm mailing list manager USE_QMAIL_RUN= yes @@ -29,28 +25,29 @@ CONFLICTS= ezmlm-0.* # LANGUAGE is the ISO code for the language to use in ezmlmrc LANGUAGE?= en_US +SUB_FILES= pkg-message + +OPTIONS= MYSQL "Build MySQL extensions" off \ + PGSQL "Build PostgreSQL extensions" off + +.include + # If WITH_MYSQL is defined, build with MySQL extensions .if defined(WITH_MYSQL) -ALL_TARGET= mysql it ${LANGUAGE} USE_MYSQL= yes EXTRACT_INCLUDE+= -I${LOCALBASE}/include/mysql EXTRACT_LIB+= -L${LOCALBASE}/lib/mysql -lmysqlclient -lm -.elif defined(WITH_POSTGRESQL) -ALL_TARGET= pgsql it ${LANGUAGE} +.elif defined(WITH_PGSQL) USE_PGSQL= yes EXTRACT_INCLUDE+= -I${LOCALBASE}/include EXTRACT_LIB+= -L${LOCALBASE}/lib -lpq -lcrypt -.else -ALL_TARGET= it ${LANGUAGE} .endif -RESTRICTED= Unsure of DJB license +ALL_TARGET= it ${LANGUAGE} WRKSRC= ${WRKDIR}/ezmlm-${EZMLM_VERSION} EZMLM_VERSION= 0.53 -PKGMESSAGE= ${WRKDIR}/pkg-message - PROGRAMS= ezmlm-archive ezmlm-cgi ezmlm-clean ezmlm-cron ezmlm-gate \ ezmlm-get ezmlm-idx ezmlm-issubn ezmlm-limit ezmlm-list \ ezmlm-make ezmlm-manage ezmlm-moderate ezmlm-request \ @@ -75,13 +72,16 @@ pre-patch: @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < idx.patch post-patch: + @${ECHO_CMD} /usr/sbin > ${WRKSRC}/conf-cron @${ECHO_CMD} ${PREFIX}/bin > ${WRKSRC}/conf-bin @${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc @${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld .if defined(WITH_MYSQL) + @${ECHO_CMD} mysql > ${WRKSRC}/conf-sub @${ECHO_CMD} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_mysql/conf-sqlcc @${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_mysql/conf-sqlld -.elif defined(WITH_POSTGRESQL) +.elif defined(WITH_PGSQL) + @${ECHO_CMD} pgsql > ${WRKSRC}/conf-sub @${ECHO_CMD} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_pgsql/conf-sqlcc @${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld .endif @@ -91,7 +91,7 @@ post-patch: ${WRKSRC}/idx.h do-install: - cd ${WRKSRC} && \ + @cd ${WRKSRC} && \ ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \ ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin && \ ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1 && \ @@ -100,12 +100,12 @@ do-install: .for file in ${CONFIG} @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc/ezmlm/${file}.sample .endfor + +post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif - @${SED} -e 's,$${PREFIX},${PREFIX},' ${.CURDIR}/pkg-message \ - > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo index 623093be13dd..f88c44ecfcb1 100644 --- a/mail/ezmlm-idx/distinfo +++ b/mail/ezmlm-idx/distinfo @@ -1,9 +1,6 @@ -MD5 (ezmlm-idx-0.40.tar.gz) = c6137114060cff19301a956e73d46fc0 -SHA256 (ezmlm-idx-0.40.tar.gz) = d205c466b11d07c0f1e093d3c7ca9204e06a518cbf7dfcd290f232875f92a1e0 -SIZE (ezmlm-idx-0.40.tar.gz) = 553974 +MD5 (ezmlm-idx-0.444.tar.gz) = d413a3a85054f4cf5f836f513e7b523e +SHA256 (ezmlm-idx-0.444.tar.gz) = d442ebf1fff0f6d254b0d9563b9ee7577746ad01392bf1655f77b7ff9e9380e1 +SIZE (ezmlm-idx-0.444.tar.gz) = 615519 MD5 (ezmlm-0.53.tar.gz) = 108c632caaa8cdbfd3041e6c449191b2 SHA256 (ezmlm-0.53.tar.gz) = 9639c3a5cc49d417f30e6cd7d8c5e2c6945262953c143134035889d8aa1004b9 SIZE (ezmlm-0.53.tar.gz) = 62693 -MD5 (ezmlm-cgi.patch) = 6795309488af3499ebbbd71c0f4197e7 -SHA256 (ezmlm-cgi.patch) = b8a9f38b1cd661dc26a646bfa1856d22ddd47059189b3f42a6eb654f94ed6774 -SIZE (ezmlm-cgi.patch) = 4055 diff --git a/mail/ezmlm-idx/pkg-message b/mail/ezmlm-idx/files/pkg-message.in similarity index 55% rename from mail/ezmlm-idx/pkg-message rename to mail/ezmlm-idx/files/pkg-message.in index 90a42f488c55..ba2f692cd6e1 100644 --- a/mail/ezmlm-idx/pkg-message +++ b/mail/ezmlm-idx/files/pkg-message.in @@ -1,12 +1,14 @@ +----------------------------------------------------------------- ezmlm-idx has been installed successfully. However, before you can use the programs, you should copy the "ezmlmglrc.sample", "ezmlmrc.sample" and "ezmlmsubrc.sample" files -in ${PREFIX}/etc/ezmlm to "ezmlmglrc", "ezmlmrc" and "ezmlmsubrc" +in %%PREFIX%%/etc/ezmlm to "ezmlmglrc", "ezmlmrc" and "ezmlmsubrc" respectively. Usually, you do not need to edit these files, but be sure to check carefully. If you have enabled the MySQL extensions, you need to create an -ezmlm database. See INSTALL.idx in ${PREFIX}/share/doc/ezmlm-idx. +ezmlm database. See INSTALL.idx in %%PREFIX%%/share/doc/ezmlm-idx. +----------------------------------------------------------------- diff --git a/mail/ezmlm-idx/pkg-descr b/mail/ezmlm-idx/pkg-descr index 19fbec4f6e28..8cbdbb1f3af7 100644 --- a/mail/ezmlm-idx/pkg-descr +++ b/mail/ezmlm-idx/pkg-descr @@ -8,16 +8,13 @@ ezmlm-idx adds the following features: - subscriber-only restrictions - message trailer - subject prefix -- subscriber name storage, +- subscriber name storage - customizable setup - multi-language and MIME support - improved bounce handling - case-insensitive subscriber address storage - distributed lists (main + sublist transparent to the subscriber) -- SQL support (MySQL or Postgres) for centrally administrated +- SQL support (MySQL or PostgreSQL) for centrally administered distributed lists -WWW: http://www.ezmlm.org/ - -- Tom -tom@FreeBSD.org +WWW: http://www.ezmlm.org/