From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 23 03:30:25 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8797116A4CF for ; Sun, 23 Nov 2003 03:30:25 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D679443FE0 for ; Sun, 23 Nov 2003 03:30:21 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hANBULFY088703 for ; Sun, 23 Nov 2003 03:30:21 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hANBULpg088702; Sun, 23 Nov 2003 03:30:21 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 23 Nov 2003 03:30:21 -0800 (PST) Resent-Message-Id: <200311231130.hANBULpg088702@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Dupre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E30616A4CE; Sun, 23 Nov 2003 03:29:29 -0800 (PST) Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id F136443F85; Sun, 23 Nov 2003 03:29:27 -0800 (PST) (envelope-from alex@armada.alexdupre.com) Received: from armada.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245]) by relay.gufi.org (Postfix) with ESMTP id BBFC420F47; Sun, 23 Nov 2003 12:29:26 +0100 (CET) Received: from armada.alexdupre.com (armada.alexdupre.com [192.168.0.177]) hANBTQDJ030862; Sun, 23 Nov 2003 12:29:26 +0100 (CET) (envelope-from alex@armada.alexdupre.com) Received: (from alex@localhost) by armada.alexdupre.com (8.12.10/8.12.10/Submit) id hANBTQiV030861; Sun, 23 Nov 2003 12:29:26 +0100 (CET) (envelope-from alex) Message-Id: <200311231129.hANBTQiV030861@armada.alexdupre.com> Date: Sun, 23 Nov 2003 12:29:26 +0100 (CET) From: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: roam@FreeBSD.org Subject: ports/59606: [Update] Port: mail/qmailadmin X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Dupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2003 11:30:25 -0000 >Number: 59606 >Category: ports >Synopsis: [Update] Port: mail/qmailadmin >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Nov 23 03:30:21 PST 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Fri Nov 21 17:45:13 CET 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386 >Description: Update to 1.0.29 release. Add WITH_HELP knob. Supercedes PR 58299. >How-To-Repeat: >Fix: --- qmailadmin.diff begins here --- diff -ruN qmailadmin.orig/Makefile qmailadmin/Makefile --- qmailadmin.orig/Makefile Sun Nov 23 12:13:15 2003 +++ qmailadmin/Makefile Sun Nov 23 12:15:28 2003 @@ -6,7 +6,7 @@ # PORTNAME= qmailadmin -PORTVERSION= 1.0.26 +PORTVERSION= 1.0.29 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -51,6 +51,7 @@ # WITH_DOMAIN_AUTOFILL - autofill the domain on login page based on the # hostname # WITHOUT_IDX_SQL - disable the SQL support for mailing lists +# WITH_HELP - display help links on login page # CGIBINDIR?= www/cgi-bin.default @@ -81,7 +82,7 @@ --enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \ --enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \ - --with-htmllibdir=${DATADIR} \ + --enable-htmllibdir=${DATADIR} \ --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ --enable-cgipath=${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \ --enable-vpopmaildir=${LOCALBASE}/vpopmail \ @@ -89,23 +90,27 @@ --enable-ezmlmdir=${LOCALBASE}/bin .if defined(WITHOUT_IPAUTH) -CONFIGURE_ARGS+= --enable-ipauth=n +CONFIGURE_ARGS+= --disable-ipauth .endif .if defined(WITHOUT_USER_INDEX) -CONFIGURE_ARGS+= --enable-user-index=n +CONFIGURE_ARGS+= --disable-user-index .endif .if defined(WITH_MODIFY_QUOTA) -CONFIGURE_ARGS+= --enable-modify-quota=y +CONFIGURE_ARGS+= --enable-modify-quota .endif .if defined(WITH_DOMAIN_AUTOFILL) -CONFIGURE_ARGS+= --enable-domain-autofill=y +CONFIGURE_ARGS+= --enable-domain-autofill .endif .if defined(WITHOUT_IDX_SQL) -CONFIGURE_ARGS+= --enable-ezmlm-mysql=n +CONFIGURE_ARGS+= --disable-ezmlm-mysql +.endif + +.if defined(WITH_HELP) +CONFIGURE_ARGS+= --enable-help .endif .include diff -ruN qmailadmin.orig/distinfo qmailadmin/distinfo --- qmailadmin.orig/distinfo Sun Nov 23 12:13:15 2003 +++ qmailadmin/distinfo Sun Nov 23 12:15:46 2003 @@ -1 +1 @@ -MD5 (qmailadmin-1.0.26.tar.gz) = aebf27ff839bae13cefb09e444a59bdd +MD5 (qmailadmin-1.0.29.tar.gz) = 2664fdc0ef0350abea1aacc270ba8d25 diff -ruN qmailadmin.orig/files/patch-Makefile.in qmailadmin/files/patch-Makefile.in --- qmailadmin.orig/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ qmailadmin/files/patch-Makefile.in Sun Nov 23 12:14:25 2003 @@ -0,0 +1,42 @@ +--- Makefile.in.orig Sat Oct 18 01:37:05 2003 ++++ Makefile.in Mon Oct 20 22:37:00 2003 +@@ -131,39 +131,6 @@ + all: all-redirect + .SUFFIXES: + .SUFFIXES: .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile +- +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) \ +- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +- +-$(ACLOCAL_M4): configure.in +- cd $(srcdir) && $(ACLOCAL) +- +-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- $(SHELL) ./config.status --recheck +-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +- cd $(srcdir) && $(AUTOCONF) +- +-config.h: stamp-h +- @if test ! -f $@; then \ +- rm -f stamp-h; \ +- $(MAKE) stamp-h; \ +- else :; fi +-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status +- cd $(top_builddir) \ +- && CONFIG_FILES= CONFIG_HEADERS=config.h \ +- $(SHELL) ./config.status +- @echo timestamp > stamp-h 2> /dev/null +-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in +- @if test ! -f $@; then \ +- rm -f $(srcdir)/stamp-h.in; \ +- $(MAKE) $(srcdir)/stamp-h.in; \ +- else :; fi +-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOHEADER) +- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + + mostlyclean-hdr: + diff -ruN qmailadmin.orig/pkg-plist qmailadmin/pkg-plist --- qmailadmin.orig/pkg-plist Sun Nov 23 12:13:15 2003 +++ qmailadmin/pkg-plist Sun Nov 23 12:14:25 2003 @@ -7,8 +7,6 @@ %%DATADIR%%/html/add_mailinglist-no-idx.html %%DATADIR%%/html/add_user.html %%DATADIR%%/html/colortable -%%DATADIR%%/html/da -%%DATADIR%%/html/de %%DATADIR%%/html/del_autorespond_confirm.html %%DATADIR%%/html/del_forward_confirm.html %%DATADIR%%/html/del_listdig.html @@ -16,24 +14,13 @@ %%DATADIR%%/html/del_listuser.html %%DATADIR%%/html/del_mailinglist_confirm.html %%DATADIR%%/html/del_user_confirm.html -%%DATADIR%%/html/en -%%DATADIR%%/html/es %%DATADIR%%/html/footer.html -%%DATADIR%%/html/fr %%DATADIR%%/html/header.html -%%DATADIR%%/html/hu -%%DATADIR%%/html/it -%%DATADIR%%/html/ja %%DATADIR%%/html/main_menu.html %%DATADIR%%/html/mod_autorespond.html %%DATADIR%%/html/mod_dotqmail.html %%DATADIR%%/html/mod_mailinglist-idx.html %%DATADIR%%/html/mod_user.html -%%DATADIR%%/html/nl -%%DATADIR%%/html/no -%%DATADIR%%/html/pt-BR -%%DATADIR%%/html/pl -%%DATADIR%%/html/ru %%DATADIR%%/html/setremotecatchall.html %%DATADIR%%/html/show_autorespond.html %%DATADIR%%/html/show_digest_subscribers.html @@ -43,10 +30,23 @@ %%DATADIR%%/html/show_moderators.html %%DATADIR%%/html/show_subscribers.html %%DATADIR%%/html/show_users.html -%%DATADIR%%/html/sk -%%DATADIR%%/html/sv -%%DATADIR%%/html/tr -%%DATADIR%%/html/xaa +%%DATADIR%%/lang/bg +%%DATADIR%%/lang/da +%%DATADIR%%/lang/de +%%DATADIR%%/lang/en +%%DATADIR%%/lang/es +%%DATADIR%%/lang/fr +%%DATADIR%%/lang/hu +%%DATADIR%%/lang/it +%%DATADIR%%/lang/ja +%%DATADIR%%/lang/nl +%%DATADIR%%/lang/no +%%DATADIR%%/lang/pl +%%DATADIR%%/lang/pt-BR +%%DATADIR%%/lang/ru +%%DATADIR%%/lang/sk +%%DATADIR%%/lang/sv +%%DATADIR%%/lang/tr %%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/delete.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/disabled.png @@ -74,4 +74,5 @@ @unexec /bin/rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true @unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true @dirrm %%DATADIR%%/html +@dirrm %%DATADIR%%/lang @dirrm %%DATADIR%% --- qmailadmin.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: