Date: Mon, 20 Oct 2003 22:41:31 +0200 (CEST) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roam@FreeBSD.org Subject: ports/58299: [Update] Port: mail/qmailadmin Message-ID: <200310202041.h9KKfUnY024895@vaio.alexdupre.com> Resent-Message-ID: <200310202050.h9KKoJuR020055@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58299
>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: Mon Oct 20 13:50:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Alex Dupre
>Release: FreeBSD 4.9-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.9-ALEXDUPRE i386
>Description:
Update to 1.0.28 release.
Add WITH_HELP knob.
Supercedes PR 56724.
>How-To-Repeat:
>Fix:
--- qmailadmin.diff begins here ---
diff -ruN qmailadmin.orig/Makefile qmailadmin/Makefile
--- qmailadmin.orig/Makefile Mon Oct 20 21:41:16 2003
+++ qmailadmin/Makefile Mon Oct 20 21:45:31 2003
@@ -6,7 +6,7 @@
#
PORTNAME= qmailadmin
-PORTVERSION= 1.0.26
+PORTVERSION= 1.0.28
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 <bsd.port.post.mk>
diff -ruN qmailadmin.orig/distinfo qmailadmin/distinfo
--- qmailadmin.orig/distinfo Mon Oct 20 21:41:16 2003
+++ qmailadmin/distinfo Mon Oct 20 21:45:42 2003
@@ -1 +1 @@
-MD5 (qmailadmin-1.0.26.tar.gz) = aebf27ff839bae13cefb09e444a59bdd
+MD5 (qmailadmin-1.0.28.tar.gz) = b9ef71bbdac874ca99fc40a465d5895e
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 Mon Oct 20 22:37:03 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/files/patch-configure qmailadmin/files/patch-configure
--- qmailadmin.orig/files/patch-configure Thu Jan 1 01:00:00 1970
+++ qmailadmin/files/patch-configure Mon Oct 20 22:22:12 2003
@@ -0,0 +1,11 @@
+--- configure.orig Mon Oct 20 22:21:38 2003
++++ configure Mon Oct 20 22:21:51 2003
+@@ -1625,7 +1625,7 @@
+ # Check whether --enable-htmllibdir or --disable-htmllibdir was given.
+ if test "${enable_htmllibdir+set}" = set; then
+ enableval="$enable_htmllibdir"
+- htmllibdir="$withval"
++ htmllibdir="$enableval"
+ else
+
+ if test "$htmllibdir" = ""
diff -ruN qmailadmin.orig/pkg-plist qmailadmin/pkg-plist
--- qmailadmin.orig/pkg-plist Mon Oct 20 21:41:16 2003
+++ qmailadmin/pkg-plist Mon Oct 20 22:38:17 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310202041.h9KKfUnY024895>