Date: Mon, 3 Dec 2012 18:02:32 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1107 - in trunk/www: linux-firefox linux-seamonkey Message-ID: <201212031802.qB3I2Wp2073037@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Dec 3 18:02:31 2012
New Revision: 1107
Log:
fix plist with pkgng and regen (make create-plist)
Modified:
trunk/www/linux-firefox/pkg-plist
trunk/www/linux-seamonkey/Makefile.common
trunk/www/linux-seamonkey/pkg-plist
Modified: trunk/www/linux-firefox/pkg-plist
==============================================================================
--- trunk/www/linux-firefox/pkg-plist Tue Nov 27 09:00:32 2012 (r1106)
+++ trunk/www/linux-firefox/pkg-plist Mon Dec 3 18:02:31 2012 (r1107)
@@ -66,19 +66,19 @@
@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true
@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true
-@dirrm lib/%%APP_NAME%%/searchplugins
-@dirrm lib/%%APP_NAME%%/jsloader/resource
-@dirrm lib/%%APP_NAME%%/jsloader
-@dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/hyphenation
-@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/%%APP_NAME%%/extensions
-@dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/defaults/pref
-@dirrm lib/%%APP_NAME%%/defaults
-@dirrm lib/%%APP_NAME%%/components
@dirrm lib/%%APP_NAME%%/chrome/icons/default
@dirrm lib/%%APP_NAME%%/chrome/icons
@dirrm lib/%%APP_NAME%%/chrome
+@dirrm lib/%%APP_NAME%%/components
+@dirrm lib/%%APP_NAME%%/defaults/pref
+@dirrm lib/%%APP_NAME%%/defaults
+@dirrm lib/%%APP_NAME%%/dictionaries
+@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/%%APP_NAME%%/extensions
+@dirrm lib/%%APP_NAME%%/icons
+@dirrm lib/%%APP_NAME%%/jsloader/resource
+@dirrm lib/%%APP_NAME%%/jsloader
+@dirrm lib/%%APP_NAME%%/plugins
+@dirrm lib/%%APP_NAME%%/searchplugins
@dirrm lib/%%APP_NAME%%
@dirrmtry share/applications
Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common Tue Nov 27 09:00:32 2012 (r1106)
+++ trunk/www/linux-seamonkey/Makefile.common Mon Dec 3 18:02:31 2012 (r1107)
@@ -37,6 +37,7 @@
.if !target(post-extract)
post-extract:
@${RM} -rf ${WRKSRC}/updates
+ @${MKDIR} ${WRKSRC}/plugins ${WRKSRC}/extensions
.endif
.if ${CATEGORIES:Mwww}
@@ -60,6 +61,26 @@
${FDIR}/extensions/ ${_Q}
.endif
+# Keep empty directories with pkg_* tools
+.if !target(post-extract-script)
+post-extract-script:
+ @if [ "${PKG_BIN:T}" != "pkg" ]; then \
+ for d in $$(${FIND} ${WRKSRC} -type d -empty); do \
+ ${TOUCH} $$d/.keep_me; \
+ ${ECHO_CMD} lib/${APP_NAME}/$${d#${WRKSRC}/}/.keep_me \
+ >> ${WRKDIR}/.PLIST.opkg; \
+ done; \
+ fi
+.endif
+
+.if !target(post-install-script)
+post-install-script:
+ @if [ -f ${WRKDIR}/.PLIST.opkg ]; then \
+ ${CAT} ${TMPPLIST} >> ${WRKDIR}/.PLIST.opkg; \
+ ${MV} ${WRKDIR}/.PLIST.opkg ${TMPPLIST}; \
+ fi
+.endif
+
# Maintainer section
create-plist: build
${ECHO_CMD} bin/%%APP_NAME%% > ${PLIST}
Modified: trunk/www/linux-seamonkey/pkg-plist
==============================================================================
--- trunk/www/linux-seamonkey/pkg-plist Tue Nov 27 09:00:32 2012 (r1106)
+++ trunk/www/linux-seamonkey/pkg-plist Mon Dec 3 18:02:31 2012 (r1107)
@@ -17,8 +17,8 @@
lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow16.png
lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow48.png
lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties.png
-lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties48.png
lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties16.png
+lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties48.png
lib/%%APP_NAME%%/chrome/icons/default/default.png
lib/%%APP_NAME%%/chrome/icons/default/default16.png
lib/%%APP_NAME%%/chrome/icons/default/default48.png
@@ -117,32 +117,35 @@
lib/%%APP_NAME%%/searchplugins/google.xml
lib/%%APP_NAME%%/searchplugins/wikipedia.xml
lib/%%APP_NAME%%/searchplugins/yahoo.xml
+lib/%%APP_NAME%%/update-settings.ini
lib/%%APP_NAME%%/updater
lib/%%APP_NAME%%/updater.ini
-lib/%%APP_NAME%%/update-settings.ini
@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true
@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true
-@dirrm lib/%%APP_NAME%%/searchplugins
-@dirrm lib/%%APP_NAME%%/jssubloader/185/resource
-@dirrm lib/%%APP_NAME%%/jssubloader/185
-@dirrm lib/%%APP_NAME%%/jssubloader
-@dirrm lib/%%APP_NAME%%/jsloader/resource
-@dirrm lib/%%APP_NAME%%/jsloader
-@dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/extensions
-@dirrm lib/%%APP_NAME%%/distribution/extensions
-@dirrm lib/%%APP_NAME%%/distribution
-@dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/defaults/profile
-@dirrm lib/%%APP_NAME%%/defaults/pref
-@dirrm lib/%%APP_NAME%%/defaults/messenger
-@dirrm lib/%%APP_NAME%%/defaults
-@dirrm lib/%%APP_NAME%%/components
@dirrm lib/%%APP_NAME%%/chrome/icons/default
@dirrm lib/%%APP_NAME%%/chrome/icons
@dirrm lib/%%APP_NAME%%/chrome
+@dirrm lib/%%APP_NAME%%/components
+@dirrm lib/%%APP_NAME%%/defaults/messenger
+@dirrm lib/%%APP_NAME%%/defaults/pref
+@dirrm lib/%%APP_NAME%%/defaults/profile
+@dirrm lib/%%APP_NAME%%/defaults
+@dirrm lib/%%APP_NAME%%/dictionaries
+@dirrm lib/%%APP_NAME%%/distribution/extensions
+@dirrm lib/%%APP_NAME%%/distribution
+@dirrm lib/%%APP_NAME%%/extensions
+@dirrm lib/%%APP_NAME%%/icons
+@dirrm lib/%%APP_NAME%%/isp
+@dirrm lib/%%APP_NAME%%/modules/services-aitc
+@dirrm lib/%%APP_NAME%%/modules/services-common
+@dirrm lib/%%APP_NAME%%/modules/services-crypto
+@dirrm lib/%%APP_NAME%%/modules/services-notifications
+@dirrm lib/%%APP_NAME%%/modules/services-sync/engines
+@dirrm lib/%%APP_NAME%%/modules/services-sync
+@dirrm lib/%%APP_NAME%%/modules
+@dirrm lib/%%APP_NAME%%/plugins
+@dirrm lib/%%APP_NAME%%/searchplugins
@dirrm lib/%%APP_NAME%%
@dirrmtry share/applications
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212031802.qB3I2Wp2073037>