diff options
| author | flo <flo@FreeBSD.org> | 2013-07-05 05:53:31 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-07-05 05:53:31 +0800 |
| commit | 3398c8e77464d83f2fbcd4f7a7c62557311a7866 (patch) | |
| tree | 6b45b118fcf8cc4300c8a455bd5e989492b73ff3 | |
| parent | 90ef46a6fdb1d40139f292425cbdde9d4c9900ad (diff) | |
| download | freebsd-ports-gnome-3398c8e77464d83f2fbcd4f7a7c62557311a7866.tar.gz freebsd-ports-gnome-3398c8e77464d83f2fbcd4f7a7c62557311a7866.tar.zst freebsd-ports-gnome-3398c8e77464d83f2fbcd4f7a7c62557311a7866.zip | |
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.
| -rw-r--r-- | mail/thunderbird-i18n/Makefile | 10 | ||||
| -rw-r--r-- | www/firefox-esr-i18n/Makefile | 11 | ||||
| -rw-r--r-- | www/firefox-i18n/Makefile | 11 | ||||
| -rw-r--r-- | www/seamonkey-i18n/Makefile | 11 |
4 files changed, 32 insertions, 11 deletions
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index b3c49a5317eb..e0517a939923 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -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 | \ diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index 27e42d4e5539..986d2870aac5 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -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 | \ diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index e12d7c481843..7e98510a53a8 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -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 | \ diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile index 7d567d1571aa..590b6943a8be 100644 --- a/www/seamonkey-i18n/Makefile +++ b/www/seamonkey-i18n/Makefile @@ -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 | \ |