svn commit: r322291 - in head: mail/thunderbird-i18n www/firefox-esr-i18n www/firefox-i18n www/seamonkey-i18n

[Florian Smeets]

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 at 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 at 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 at 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 at seamonkey.mozilla.org ${_A} ; \
+			fi ; \
+		done ; \
+	done
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \