diff -urN /usr/ports/mail/sqwebmail/Makefile sqwebmail/Makefile --- /usr/ports/mail/sqwebmail/Makefile Fri Mar 7 15:06:00 2003 +++ sqwebmail/Makefile Fri Mar 28 11:14:00 2003 @@ -26,9 +26,9 @@ # set IMAGEURL to where on the web server URL the images are found # -CGIBINDIR?= ${PREFIX}/www/cgi-bin.default +CGIBINDIR?= www/cgi-bin.default CGIBINSUBDIR?= sqwebmail -WEBDATADIR?= ${PREFIX}/www/data.default +WEBDATADIR?= www/data.default WEBDATASUBDIR?= sqwebmail IMAGEURL?= ${WEBDATASUBDIR} @@ -50,6 +50,9 @@ # set WITH_MAXFORMARGSIZE to max size of attachments +PLIST_SUB+= CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \ + WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}" + CACHEDIR?= /var/sqwebmail/cache CACHEOWNER?= bin VCHKPWLOC?= ${LOCALBASE}/vpopmail @@ -60,8 +63,8 @@ HAS_CONFIGURE= YES CONFIGURE_ARGS= \ - --enable-cgibindir=${CGIBINDIR}/${CGIBINSUBDIR} \ - --enable-imagedir=${WEBDATADIR}/${WEBDATASUBDIR} \ + --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ + --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --without-authmysql \ --libexecdir=${PREFIX}/libexec/sqwebmail \ --mandir=${PREFIX}/share/sqwebmail/man \ diff -urN /usr/ports/mail/sqwebmail/pkg-plist sqwebmail/pkg-plist --- /usr/ports/mail/sqwebmail/pkg-plist Mon Aug 5 05:23:11 2002 +++ sqwebmail/pkg-plist Fri Mar 28 10:57:20 2003 @@ -76,44 +76,43 @@ share/sqwebmail/sendit.sh share/sqwebmail/share/locale/locale.alias share/sqwebmail/webgpg -www/cgi-bin.default/sqwebmail/sqwebmail -www/data.default/sqwebmail/bg.gif -www/data.default/sqwebmail/bluebottomleft.gif -www/data.default/sqwebmail/bluebottomright.gif -www/data.default/sqwebmail/bluetopleft.gif -www/data.default/sqwebmail/bluetopright.gif -www/data.default/sqwebmail/calendar.gif -www/data.default/sqwebmail/cancel.gif -www/data.default/sqwebmail/folder.gif -www/data.default/sqwebmail/folder2.gif -www/data.default/sqwebmail/folders.gif -www/data.default/sqwebmail/forward.gif -www/data.default/sqwebmail/forwardatt.gif -www/data.default/sqwebmail/fullheaders.gif -www/data.default/sqwebmail/graybottomleft.gif -www/data.default/sqwebmail/graybottomright.gif -www/data.default/sqwebmail/graytopleft.gif -www/data.default/sqwebmail/graytopright.gif -www/data.default/sqwebmail/left.gif -www/data.default/sqwebmail/left2.gif -www/data.default/sqwebmail/logo.gif -www/data.default/sqwebmail/print.gif -www/data.default/sqwebmail/reply.gif -www/data.default/sqwebmail/replyall.gif -www/data.default/sqwebmail/replylist.gif -www/data.default/sqwebmail/right.gif -www/data.default/sqwebmail/right2.gif -www/data.default/sqwebmail/save.gif -www/data.default/sqwebmail/sep.gif -www/data.default/sqwebmail/signin.gif -www/data.default/sqwebmail/sqwebmail.css -www/data.default/sqwebmail/trash2.gif -www/data.default/sqwebmail/uncancel.gif -@dirrm www/data.default/sqwebmail -@unexec /bin/rmdir %D/www/data.default 2> /dev/null || true -@dirrm www/cgi-bin.default/sqwebmail -@unexec /bin/rmdir %D/www/cgi-bin.default 2> /dev/null || true -@unexec /bin/rmdir %D/www 2> /dev/null || true +%%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sqwebmail.css +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.gif +%%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.gif +@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%% +@unexec /bin/rmdir %%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true +@dirrm %%CGIBINDIR%%/%%CGIBINSUBDIR%% +@unexec /bin/rmdir %%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true @dirrm share/sqwebmail/var/calendar/public @dirrm share/sqwebmail/var/calendar/private @dirrm share/sqwebmail/var/calendar/localcache