Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Oct 2014 23:20:12 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371956 - head/mail/mulberry
Message-ID:  <201410312320.s9VNKCm5025762@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Oct 31 23:20:11 2014
New Revision: 371956
URL: https://svnweb.freebsd.org/changeset/ports/371956
QAT: https://qat.redports.org/buildarchive/r371956/

Log:
  Simplify plist
  Avoid useless manipulation of files in do-install

Modified:
  head/mail/mulberry/Makefile
  head/mail/mulberry/pkg-plist

Modified: head/mail/mulberry/Makefile
==============================================================================
--- head/mail/mulberry/Makefile	Fri Oct 31 23:11:27 2014	(r371955)
+++ head/mail/mulberry/Makefile	Fri Oct 31 23:20:11 2014	(r371956)
@@ -48,9 +48,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/Plug-ins/Timezones/* ${STAGEDIR}${PLUGINSDIR}/Timezones
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/mailcap ${STAGEDIR}${EXAMPLESDIR}
-	@[ -f ${PREFIX}/etc/mailcap ] || ${INSTALL_DATA} ${FILESDIR}/mailcap ${STAGEDIR}${PREFIX}/etc/mailcap
 	${INSTALL_DATA} ${FILESDIR}/url.helpers ${STAGEDIR}${EXAMPLESDIR}
-	@[ -f ${PREFIX}/lib/url.helpers ] || ${INSTALL_DATA} ${FILESDIR}/url.helpers ${STAGEDIR}${PREFIX}/lib/url.helpers
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_DIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/CHANGES* ${STAGEDIR}${DOCSDIR}

Modified: head/mail/mulberry/pkg-plist
==============================================================================
--- head/mail/mulberry/pkg-plist	Fri Oct 31 23:11:27 2014	(r371955)
+++ head/mail/mulberry/pkg-plist	Fri Oct 31 23:20:11 2014	(r371956)
@@ -1,6 +1,5 @@
 bin/%%PORTNAME%%
 lib/%%PORTNAME%%/Plug-ins/Timezones/vtimezones.ics
-@dirrm lib/%%PORTNAME%%/Plug-ins/Timezones
 lib/%%PORTNAME%%/Plug-ins/CRAMMD5Plugin.so
 lib/%%PORTNAME%%/Plug-ins/CommunicatorAdbkIOPlugin.so
 lib/%%PORTNAME%%/Plug-ins/DIGESTMD5Plugin.so
@@ -27,9 +26,6 @@ lib/%%PORTNAME%%/Resources/Status.xml
 lib/%%PORTNAME%%/Resources/Strings.xml
 lib/%%PORTNAME%%/Resources/Toolbars.xml
 lib/%%PORTNAME%%/Resources/UI.xml
-@dirrm lib/%%PORTNAME%%/Plug-ins
-@dirrm lib/%%PORTNAME%%/Resources
-@dirrm lib/%%PORTNAME%%
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-DEV
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-DEV-v3
@@ -38,13 +34,11 @@ lib/%%PORTNAME%%/Resources/UI.xml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-v4
 %%PORTDOCS%%%%DOCSDIR%%/Mulberry_License
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -p %D/%%EXAMPLESDIR%% 2> /dev/null || true
 @unexec if cmp -s %D/etc/mailcap %D/%%EXAMPLESDIR%%/mailcap; then rm -f %D/etc/mailcap; fi
 %%EXAMPLESDIR%%/mailcap
 @exec [ -f %D/etc/mailcap ] || cp %D/%%EXAMPLESDIR%%/mailcap %D/etc/mailcap
 @unexec if cmp -s %D/lib/url.helpers %D/%%EXAMPLESDIR%%/url.helpers; then rm -f %D/lib/url.helpers; fi
 %%EXAMPLESDIR%%/url.helpers
 @exec [ -f %D/lib/url.helpers ] || cp %D/%%EXAMPLESDIR%%/url.helpers %D/lib/url.helpers
-@dirrm %%EXAMPLESDIR%%
 share/pixmaps/%%PORTNAME%%.png
 share/pixmaps/%%PORTNAME%%.xpm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410312320.s9VNKCm5025762>