Index: head/mail/qmailadmin/Makefile =================================================================== --- head/mail/qmailadmin/Makefile (revision 398710) +++ head/mail/qmailadmin/Makefile (revision 398711) @@ -1,145 +1,146 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= qmailadmin PORTVERSION= 1.2.15 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 2 CATEGORIES= mail www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \ http://mirror.shatow.net/freebsd/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= CGI program for administering Qmail with vchkpw/vpopmail LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual BUILD_DEPENDS= \ autorespond:${PORTSDIR}/mail/autorespond \ ${VPOPMAIL_DIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail RUN_DEPENDS= \ autorespond:${PORTSDIR}/mail/autorespond \ ${VPOPMAIL_DIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail USES= qmail:vars gmake PATCH_SITES+= http://qmail.jms1.net/vpopmail/:onchange \ LOCAL/bdrewery/${PORTNAME}/:onchange PATCHFILES+= qmailadmin-1.2.12-onchange.3.patch:onchange PATCH_DIST_STRIP+= -p1 PORTSCOUT= ignore:1 USE_AUTOTOOLS= automake aclocal autoconf AUTOMAKE_ARGS+= --add-missing OPTIONS_DEFINE= IPAUTH USER_INDEX MODIFY_QUOTA DOMAIN_AUTOFILL \ IDX IDX_SQL HELP SPAM_DETECTION SPAM_NEEDS_EMAIL \ CATCHALL TRIVIAL_PASSWORD NOCACHE CRACKLIB OPTIONS_DEFAULT=IPAUTH IDX_SQL USER_INDEX CATCHALL TRIVIAL_PASSWORD IPAUTH_DESC= Check IP address after login USER_INDEX_DESC= Enable user index display MODIFY_QUOTA_DESC= Allow domain admin to modify quotas DOMAIN_AUTOFILL_DESC= Autofill domain on login using hostname IDX_DESC= Use ezmlm-idx instead of ezmlm IDX_SQL_DESC= Enable MySQL support for ezmlm HELP_DESC= Show help links on login page SPAM_DETECTION_DESC= Allow users to toggle spam checking SPAM_NEEDS_EMAIL_DESC= Append user's email to spam command #' CATCHALL_DESC= Enable catch-all accounts TRIVIAL_PASSWORD_DESC= Disallow password containing username NOCACHE_DESC= Prohibit caching via http headers CRACKLIB_DESC= Use cracklib to enforce stronger passwords CONFIGURE_ARGS+= \ --enable-qmaildir=${QMAIL_PREFIX} \ --enable-htmldir=${WEBPREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --enable-imagedir=${WEBPREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \ --enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \ --enable-htmllibdir=${DATADIR} \ --enable-cgibindir=${WEBPREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ --enable-cgipath=${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \ --enable-vpopmaildir=${VPOPMAIL_DIR} \ --enable-autoresponder-path=${LOCALBASE}/bin \ --enable-maxusersperpage=${MAXUSERSPERPAGE} \ --enable-maxaliasesperpage=${MAXALIASESPERPAGE} \ --enable-ezmlmdir=${LOCALBASE}/bin IPAUTH_CONFIGURE_OFF= --disable-ipauth USER_INDEX_CONFIGURE_OFF= --disable-user-index MODIFY_QUOTA_CONFIGURE_ON= --enable-modify-quota DOMAIN_AUTOFILL_CONFIGURE_ON= --enable-domain-autofill IDX_SQL_CONFIGURE_OFF= --disable-ezmlm-mysql HELP_CONFIGURE_ON= --enable-help CATCHALL_CONFIGURE_OFF= --disable-catchall TRIVIAL_PASSWORD_CONFIGURE_OFF= --disable-trivial-password NOCACHE_CONFIGURE_ON= --enable-no-cache SPAM_DETECTION_CONFIGURE_ON= --enable-modify-spam=y SPAM_NEEDS_EMAIL_CONFIGURE_ENABLE= spamcmd-needs-email .include .if ${PORT_OPTIONS:MIDX} EXTRA_PATCHES+= ${FILESDIR}/extra-ezmlm-idx7.patch .endif .if ${PORT_OPTIONS:MSPAM_DETECTION} && defined(SPAM_COMMAND) CONFIGURE_ARGS+= --enable-spam-command="${SPAM_COMMAND}" .endif .if ${PORT_OPTIONS:MCRACKLIB} EXTRA_PATCHES+= ${FILESDIR}/cracklib.patch BUILD_DEPENDS+= ${LOCALBASE}/include/crack.h:${PORTSDIR}/security/cracklib CONFIGURE_ARGS+= --enable-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict CFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lcrack .endif # vpopmail installation directory # # NB: change this with extreme caution! For instance, if vpopmail is not # already installed in this directory, building the vpopmail port as # a dependency will NOT automatically cause it to be installed there! VPOPMAIL_DIR?= ${LOCALBASE}/vpopmail -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip # Notes and comments: # # SPAM_COMMAND - the command to use to check for spam; # default is "|preline LOCALBASE/bin/maildrop /etc/mailfilter" # do not forget the "|" at the start # USER_INDEX - might confuse earlier versions of Internet Explorer # CGIBINDIR - location of your cgi directory # CGIBINSUBDIR - subdirectory to place cgi scripts in # CGIBINURL - location of your cgi directory in a URL # WEBDATADIR - location of your html files # WEBDATASUBDIR - subdirectory to place html files in # WEBDATAURL - location of your html files in a URL CGIBINDIR?= www/cgi-bin.default CGIBINSUBDIR?= qmailadmin CGIBINURL?= /cgi-bin WEBDATADIR?= www/data.default WEBDATASUBDIR?= qmailadmin WEBDATAURL?= MAXUSERSPERPAGE?= 15 MAXALIASESPERPAGE?= 25 WEBPREFIX?= ${PREFIX} PLIST_SUB+= CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \ WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}" \ REAL_PREFIX="${PREFIX}" WEBPREFIX="${WEBPREFIX}" # End of user-configurable variables .if empty(PORT_OPTIONS:MIDX) BUILD_DEPENDS+= ezmlm-send:${PORTSDIR}/mail/ezmlm RUN_DEPENDS+= ezmlm-send:${PORTSDIR}/mail/ezmlm .else BUILD_DEPENDS+= ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx RUN_DEPENDS+= ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx .endif .include Index: head/mail/qmailadmin/files/patch-Makefile.am =================================================================== --- head/mail/qmailadmin/files/patch-Makefile.am (nonexistent) +++ head/mail/qmailadmin/files/patch-Makefile.am (revision 398711) @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2010-03-26 06:08:58 UTC ++++ Makefile.am +@@ -14,7 +14,7 @@ VERSION=@QA_VERSION@ + # + # Install qmailadmin setuid to @vpopuser@ + # +-INSTALL_PROGRAM=${INSTALL} -o @vpopuser@ -m 6755 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS) ++INSTALL_PROGRAM=${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s + + bindir=@cgibindir@ Property changes on: head/mail/qmailadmin/files/patch-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/qmailadmin/pkg-plist =================================================================== --- head/mail/qmailadmin/pkg-plist (revision 398710) +++ head/mail/qmailadmin/pkg-plist (revision 398711) @@ -1,87 +1,83 @@ %%DATADIR%%/html/add_autorespond.html %%DATADIR%%/html/add_forward.html %%DATADIR%%/html/add_listmod.html %%DATADIR%%/html/add_listdig.html %%DATADIR%%/html/add_listuser.html %%DATADIR%%/html/add_mailinglist-idx.html %%DATADIR%%/html/add_mailinglist-no-idx.html %%DATADIR%%/html/add_user.html %%DATADIR%%/html/change_password.html %%DATADIR%%/html/change_password_success.html %%DATADIR%%/html/colortable %%DATADIR%%/html/del_autorespond_confirm.html %%DATADIR%%/html/del_forward_confirm.html %%DATADIR%%/html/del_listdig.html %%DATADIR%%/html/del_listmod.html %%DATADIR%%/html/del_listuser.html %%DATADIR%%/html/del_mailinglist_confirm.html %%DATADIR%%/html/del_user_confirm.html %%DATADIR%%/html/footer.html %%DATADIR%%/html/header.html %%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/setremotecatchall.html %%DATADIR%%/html/show_autorespond.html %%DATADIR%%/html/show_digest_subscribers.html %%DATADIR%%/html/show_forwards.html %%DATADIR%%/html/show_login.html %%DATADIR%%/html/show_mailinglist.html %%DATADIR%%/html/show_moderators.html %%DATADIR%%/html/show_subscribers.html %%DATADIR%%/html/show_users.html %%DATADIR%%/lang/bg %%DATADIR%%/lang/cs %%DATADIR%%/lang/da %%DATADIR%%/lang/de %%DATADIR%%/lang/en %%DATADIR%%/lang/es %%DATADIR%%/lang/fi %%DATADIR%%/lang/fr %%DATADIR%%/lang/hu %%DATADIR%%/lang/it %%DATADIR%%/lang/ja %%DATADIR%%/lang/lt %%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 %%DATADIR%%/lang/zh-cn @cwd %%WEBPREFIX%% -%%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin +@(vpopmail,vchkpw,6755) %%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/delete.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/disabled.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowerleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowermiddle.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowerright.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/main.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/main1.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/main2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleleft1.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleleft2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middlelogin.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleright1.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/modify.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/pixel.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/radio-on.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/radio-off.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/trash.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperleft.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle1.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle2.png %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperright.png -@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images @unexec rmdir %%WEBPREFIX%%/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true @unexec rmdir %%WEBPREFIX%%/%%WEBDATADIR%% 2> /dev/null || true @unexec rmdir %%WEBPREFIX%%/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true @unexec rmdir %%WEBPREFIX%%/%%CGIBINDIR%% 2> /dev/null || true @cwd %%REAL_PREFIX%% -@dirrm %%DATADIR%%/html -@dirrm %%DATADIR%%/lang -@dirrm %%DATADIR%%