Date: Mon, 19 Sep 2016 09:01:45 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422418 - in head/sysutils/gosa: . files Message-ID: <201609190901.u8J91jEv072731@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Sep 19 09:01:45 2016 New Revision: 422418 URL: https://svnweb.freebsd.org/changeset/ports/422418 Log: - Switch to options helpers - Cosmetic fixes - Don't install COPYING as documentation - Regenerate patches with `make makepatch` Added: head/sysutils/gosa/files/patch-plugins_admin_opsi_class__opsiware.inc - copied, changed from r422417, head/sysutils/gosa/files/patch-class_opsiware.inc Deleted: head/sysutils/gosa/files/patch-class_opsiware.inc Modified: head/sysutils/gosa/Makefile head/sysutils/gosa/pkg-descr head/sysutils/gosa/pkg-plist Modified: head/sysutils/gosa/Makefile ============================================================================== --- head/sysutils/gosa/Makefile Mon Sep 19 08:49:32 2016 (r422417) +++ head/sysutils/gosa/Makefile Mon Sep 19 09:01:45 2016 (r422418) @@ -31,29 +31,29 @@ NO_ARCH= yes PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_ARGS= -i "" SUB_FILES= pkg-message -SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} +SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} +PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} OPTIONS_DEFINE= DOCS post-patch: - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e 's!"/etc/gosa"!"${ETCDIR}"!g' \ -e 's!"../contrib"!"${EXAMPLESDIR}/contrib"!g' \ -e 's!"/var/cache/gosa/tmp"!"/tmp"!g' \ ${WRKSRC}/include/functions.inc - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e 's!/usr/bin/php!${PREFIX}/bin/php!g' \ -e 's!("GOSA_HOME", dirname(__FILE__));!("GOSA_HOME", "${WWWDIR}");!g' \ ${WRKSRC}/update-gosa .for i in doc/core/guide.xml html/helpviewer.php include/functions_helpviewer.inc - ${REINPLACE_CMD} -e 's!"../doc/!"${DOCSDIR}/!g' ${WRKSRC}/$i + @${REINPLACE_CMD} -e 's!"../doc/!"${DOCSDIR}/!g' ${WRKSRC}/$i .endfor - ${MV} -f ${WRKSRC}/contrib/gosa.conf.5 ${WRKSRC} - ${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} + + @${MV} -f ${WRKSRC}/contrib/gosa.conf.5 ${WRKSRC} + @${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} + do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} @@ -64,10 +64,13 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/gosa.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5 @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${EXAMPLESDIR}) - @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}/var/spool/gosa + @${MKDIR} ${STAGEDIR}${ETCDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING Changelog FAQ \ + (cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS Changelog FAQ \ INSTALL README README.safemode ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${STAGEDIR}/var/spool/gosa .include <bsd.port.mk> Copied and modified: head/sysutils/gosa/files/patch-plugins_admin_opsi_class__opsiware.inc (from r422417, head/sysutils/gosa/files/patch-class_opsiware.inc) ============================================================================== --- head/sysutils/gosa/files/patch-class_opsiware.inc Mon Sep 19 08:49:32 2016 (r422417, copy source) +++ head/sysutils/gosa/files/patch-plugins_admin_opsi_class__opsiware.inc Mon Sep 19 09:01:45 2016 (r422418) @@ -1,5 +1,5 @@ ---- plugins/admin/opsi/class_opsiware.inc.orig 2008-09-05 12:38:26.000000000 +0400 -+++ plugins/admin/opsi/class_opsiware.inc 2010-05-15 21:53:22.000000000 +0400 +--- plugins/admin/opsi/class_opsiware.inc.orig 2008-09-05 08:38:26 UTC ++++ plugins/admin/opsi/class_opsiware.inc @@ -1,16 +1,5 @@ <?php @@ -17,7 +17,7 @@ class opsiWare extends plugin { private $opsi; -@@ -57,5 +46,17 @@ +@@ -57,5 +46,17 @@ class opsiWare extends plugin return($smarty->fetch(get_template_path("opsiware.tpl",TRUE,dirname(__FILE__)))); } } Modified: head/sysutils/gosa/pkg-descr ============================================================================== --- head/sysutils/gosa/pkg-descr Mon Sep 19 08:49:32 2016 (r422417) +++ head/sysutils/gosa/pkg-descr Mon Sep 19 09:01:45 2016 (r422418) @@ -4,4 +4,4 @@ to posix, shadow, samba, proxy, fax, and to manage the postfix/cyrus server combination and can write user adapted sieve scripts. -WWW: http://www.gosa-project.org +WWW: http://www.gosa-project.org/ Modified: head/sysutils/gosa/pkg-plist ============================================================================== --- head/sysutils/gosa/pkg-plist Mon Sep 19 08:49:32 2016 (r422417) +++ head/sysutils/gosa/pkg-plist Mon Sep 19 09:01:45 2016 (r422418) @@ -1881,7 +1881,6 @@ sbin/update-gosa %%EXAMPLESDIR%%/contrib/plugins/uw-imap/procmail-vacation.txt %%EXAMPLESDIR%%/contrib/shells %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/Changelog %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/INSTALL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609190901.u8J91jEv072731>