From owner-svn-ports-all@FreeBSD.ORG Thu Jul 4 21:53:32 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 598B9523; Thu, 4 Jul 2013 21:53:32 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4B5841092; Thu, 4 Jul 2013 21:53:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r64LrWSN058313; Thu, 4 Jul 2013 21:53:32 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r64LrVD5058309; Thu, 4 Jul 2013 21:53:31 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201307042153.r64LrVD5058309@svn.freebsd.org> From: Florian Smeets Date: Thu, 4 Jul 2013 21:53:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322291 - in head: mail/thunderbird-i18n www/firefox-esr-i18n www/firefox-i18n www/seamonkey-i18n X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2013 21:53:32 -0000 Author: flo Date: Thu Jul 4 21:53:31 2013 New Revision: 322291 URL: http://svnweb.freebsd.org/changeset/ports/322291 Log: Don't manually rm wildcard directories, automatically add all files to the plist. This should fixes warning on deinstall as the files were deleted in the pre-deinstall target, and once pkg wanted to remove files specified in the plist they were already gone. Modified: head/mail/thunderbird-i18n/Makefile head/www/firefox-esr-i18n/Makefile head/www/firefox-i18n/Makefile head/www/seamonkey-i18n/Makefile Modified: head/mail/thunderbird-i18n/Makefile ============================================================================== --- head/mail/thunderbird-i18n/Makefile Thu Jul 4 20:48:05 2013 (r322290) +++ head/mail/thunderbird-i18n/Makefile Thu Jul 4 21:53:31 2013 (r322291) @@ -67,8 +67,14 @@ do-install: @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @for lang in ${THUNDERBIRD_I18N_}; do \ + for xpi in ${XPI_LINKFARMS} ; do \ + if [ -d $${xpi} ] ; \ + then \ + ${ECHO_CMD} $$xpi/langpack-$$lang@thunderbird.mozilla.org ${_A} ; \ + fi ; \ + done ; \ + done post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ Modified: head/www/firefox-esr-i18n/Makefile ============================================================================== --- head/www/firefox-esr-i18n/Makefile Thu Jul 4 20:48:05 2013 (r322290) +++ head/www/firefox-esr-i18n/Makefile Thu Jul 4 21:53:31 2013 (r322291) @@ -77,9 +77,14 @@ do-install: @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} - - @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @for lang in ${FIREFOX_I18N_}; do \ + for xpi in ${XPI_LINKFARMS} ; do \ + if [ -d $${xpi} ] ; \ + then \ + ${ECHO_CMD} $$xpi/langpack-$$lang@firefox.mozilla.org ${_A} ; \ + fi ; \ + done ; \ + done post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ Modified: head/www/firefox-i18n/Makefile ============================================================================== --- head/www/firefox-i18n/Makefile Thu Jul 4 20:48:05 2013 (r322290) +++ head/www/firefox-i18n/Makefile Thu Jul 4 21:53:31 2013 (r322291) @@ -76,9 +76,14 @@ do-install: @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} - - @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @for lang in ${FIREFOX_I18N_}; do \ + for xpi in ${XPI_LINKFARMS} ; do \ + if [ -d $${xpi} ] ; \ + then \ + ${ECHO_CMD} $$xpi/langpack-$$lang@firefox.mozilla.org ${_A} ; \ + fi ; \ + done ; \ + done post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ Modified: head/www/seamonkey-i18n/Makefile ============================================================================== --- head/www/seamonkey-i18n/Makefile Thu Jul 4 20:48:05 2013 (r322290) +++ head/www/seamonkey-i18n/Makefile Thu Jul 4 21:53:31 2013 (r322291) @@ -71,9 +71,14 @@ do-install: @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} - - @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @for lang in ${SEAMONKEY_I18N_}; do \ + for xpi in ${XPI_LINKFARMS} ; do \ + if [ -d $${xpi} ] ; \ + then \ + ${ECHO_CMD} $$xpi/langpack-$$lang@seamonkey.mozilla.org ${_A} ; \ + fi ; \ + done ; \ + done post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \