Date: Sat, 26 Oct 2013 15:14:28 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331700 - head/www/baikal Message-ID: <201310261514.r9QFESPx013761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Oct 26 15:14:28 2013 New Revision: 331700 URL: http://svnweb.freebsd.org/changeset/ports/331700 Log: Handle docs and examples in the stage-way. Handle default database creation in a better way. Don't install yet another copy of the GPL3 license. PORTREVISION bump for plist changes. Drop maintainership. Modified: head/www/baikal/Makefile head/www/baikal/pkg-plist Modified: head/www/baikal/Makefile ============================================================================== --- head/www/baikal/Makefile Sat Oct 26 14:56:17 2013 (r331699) +++ head/www/baikal/Makefile Sat Oct 26 15:14:28 2013 (r331700) @@ -3,12 +3,13 @@ PORTNAME= baikal PORTVERSION= 0.2.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://baikal-server.com/get/ DISTNAME= ${PORTNAME}-regular-${PORTVERSION} EXTRACT_SUFX= .tgz -MAINTAINER= adamw@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight CalDAV/CardDAV server LICENSE= GPLv3 @@ -18,13 +19,8 @@ USE_PHP= ctype filter xml pdo_sqlite se WRKSRC= ${WRKDIR}/${PORTNAME}-regular NO_BUILD= yes -PLIST_SUB+= CALDB="${WWWDIR}/Specific/db/db.sqlite" -SUB_LIST+= CALDB="${WWWDIR}/Specific/db/db.sqlite" SUB_FILES= pkg-install pkg-message -PORTDOCS= * -PORTEXAMPLES= * - .include <bsd.port.options.mk> post-patch: ${FIND} ${WRKSRC} -type f -not -name '*.php' -exec ${CHMOD} ${SHAREMODE} {} \; @@ -34,6 +30,7 @@ post-patch: ${WRKSRC}/Specific/db/db.sqlite-dist ${CHMOD} 644 ${WRKSRC}/Specific/db/db.sqlite-dist # I can't decide whether to include this file or forbid it. +# It's probably better to make remote configuration opt-in. # ${ECHO_CMD} "platypus" > ${WRKSRC}/Specific/ENABLE_INSTALL ${RM} -f ${WRKSRC}/Specific/ENABLE_INSTALL ${REINPLACE_CMD} -e 's,/var/www/dav.mydomain.com,${WWWDIR},g' \ @@ -47,17 +44,15 @@ do-install: .endfor cd ${WRKSRC} && ${FIND} Specific -not -path '*/virtualhosts*' | \ ${CPIO} -pdmu -R ${WWWOWN}:${WWWGRP} --quiet ${STAGEDIR}${WWWDIR} -.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in INSTALL.md LICENSE.txt README.md TROUBLESHOOTING.md +.for f in INSTALL.md README.md TROUBLESHOOTING.md ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} .endfor -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in apache2 nginx ${INSTALL_DATA} ${WRKSRC}/Specific/virtualhosts/baikal.$f ${STAGEDIR}${EXAMPLESDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/www/baikal/pkg-plist ============================================================================== --- head/www/baikal/pkg-plist Sat Oct 26 14:56:17 2013 (r331699) +++ head/www/baikal/pkg-plist Sat Oct 26 15:14:28 2013 (r331700) @@ -301,8 +301,9 @@ %%WWWDIR%%/Core/Resources/Web/TwitterBootstrap %%WWWDIR%%/Specific/.htaccess @rmtry %%WWWDIR%%/Specific/ENABLE_INSTALL -@unexec if test -f %%CALDB%% && cmp -s %%CALDB%%-dist %%CALDB%%; then /bin/rm -f %%CALDB%%; fi +@unexec if cmp -s %D/Specific/db/db.sqlite-dist %D/Specific/db/db.sqlite; then rm -f %D/Specific/db/db.sqlite; fi %%WWWDIR%%/Specific/db/db.sqlite-dist +@exec if [ ! -f %D/Specific/db/db.sqlite ]; then cp -p %D/%F %B/Specific/db/db.sqlite; fi %%WWWDIR%%/html/.htaccess %%WWWDIR%%/html/admin/index.php %%WWWDIR%%/html/admin/install/index.php @@ -995,3 +996,10 @@ @dirrm %%WWWDIR%%/Core/Frameworks @dirrm %%WWWDIR%%/Core @dirrmtry %%WWWDIR%% +%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/TROUBLESHOOTING.md +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baikal.apache2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baikal.nginx +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310261514.r9QFESPx013761>