diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-26 12:09:17 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-04-26 12:09:17 +0800 |
| commit | 4950d0d45772e6c217c427ea03bd3fbfebe99aea (patch) | |
| tree | 7606abe96d4474b393c49514fa67d3acb38b10ef | |
| parent | af332dea58bec8490d6e9591288b7ddf13dbf98b (diff) | |
| download | marcuscom-ports-4950d0d45772e6c217c427ea03bd3fbfebe99aea.tar marcuscom-ports-4950d0d45772e6c217c427ea03bd3fbfebe99aea.tar.gz marcuscom-ports-4950d0d45772e6c217c427ea03bd3fbfebe99aea.tar.bz2 marcuscom-ports-4950d0d45772e6c217c427ea03bd3fbfebe99aea.tar.lz marcuscom-ports-4950d0d45772e6c217c427ea03bd3fbfebe99aea.tar.xz marcuscom-ports-4950d0d45772e6c217c427ea03bd3fbfebe99aea.tar.zst marcuscom-ports-4950d0d45772e6c217c427ea03bd3fbfebe99aea.zip | |
* Replace explicit instances of "2.0" with ${ABIVERSION}
* Protect items that use gnomehier with a check for GNOME_ENABLED
* Allow AbiWord to install a real GNOME_AbiWord_Control_2_2.server
* Fix the plist accordingly
Submitted by: Jeremy Messenger <mezz7@cox.net>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2287 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | editors/AbiWord2/Makefile | 8 | ||||
| -rw-r--r-- | editors/AbiWord2/pkg-plist | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index c7644a67f..c6b21a64a 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -93,14 +93,12 @@ pre-configure: s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE} post-install: +.if defined(GNOME_ENABLED) @${INSTALL_DATA} ${WRKSRC}/abiword.desktop \ ${PREFIX}/share/gnome/apps/Applications/abiword.desktop - @${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \ + @${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \ ${PREFIX}/share/gnome/pixmaps/abiword_48.png -.if defined(GNOME_ENABLED) - @${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server\ - ${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server - @${LN} -sf ${PREFIX}/share/AbiSuite-2.0/abi-nautilus-view-file.xml \ + @${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/abi-nautilus-view-file.xml \ ${PREFIX}/share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml .endif diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist index 631a687f4..fdf254252 100644 --- a/editors/AbiWord2/pkg-plist +++ b/editors/AbiWord2/pkg-plist @@ -2,7 +2,6 @@ bin/AbiWord-%%ABIVERSION%% bin/abiword bin/ttfadmin.sh bin/ttftool -libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server libdata/bonobo/servers/GNOME_AbiWord_Control_2_2.server share/AbiSuite-%%ABIVERSION%%/AbiWord.exe.MANIFEST share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Break.glade @@ -21,8 +20,8 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options_ColorSel.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_PageNumbers.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Replace.glade -share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist.glade +share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_WordCount.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_About.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_DocComparison.glade @@ -264,10 +263,10 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW share/applications/abiword.desktop -share/icons/abiword_48.png -share/gnome/apps/Applications/abiword.desktop +%%GNOME:%%share/gnome/apps/Applications/abiword.desktop %%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml -share/gnome/pixmaps/abiword_48.png +%%GNOME:%%share/gnome/pixmaps/abiword_48.png +share/icons/abiword_48.png @dirrm share/AbiSuite-%%ABIVERSION%%/templates @dirrm share/AbiSuite-%%ABIVERSION%%/icons @dirrm share/AbiSuite-%%ABIVERSION%%/dictionary |