diff options
Diffstat (limited to 'deskutils')
67 files changed, 1025 insertions, 766 deletions
diff --git a/deskutils/alexandria/Makefile b/deskutils/alexandria/Makefile index e8ba0f0..80380a0 100644 --- a/deskutils/alexandria/Makefile +++ b/deskutils/alexandria/Makefile @@ -7,7 +7,7 @@ PORTNAME= alexandria PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= deskutils ruby MASTER_SITES= ${MASTER_SITE_RUBYFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,12 +24,16 @@ RUN_DEPENDS= ${RUBY_SITELIBDIR}/amazon.rb:${PORTSDIR}/www/ruby-amazon \ ${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 \ ${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 +USE_GNOME= gnomehier INSTALLS_OMF= yes USE_GETTEXT= yes USE_RUBY= yes USE_RUBY_SETUP= yes RUBY_SETUP= install.rb +DOCS= NEWS README TODO +GCONF_SCHEMAS= alexandria.schemas + RUBY_REQUIRE= Ruby > 180 CONFIGURE_ARGS= "--prefix=${PREFIX}" @@ -39,7 +43,18 @@ CONFIGURE_ARGS= "--prefix=${PREFIX}" IGNORE= only works with Ruby 1.8.0 or later .endif +post-extract: + @${MV} ${WRKSRC}/data/omf ${WRKSRC}/data/gnome/ + post-install: - ${RM} ${PREFIX}/share/gnome/help/alexandria/ChangeLog + @${MKDIR} ${LOCALBASE}/etc/gconf/schemas + @${INSTALL_DATA} ${WRKSRC}/schemas/alexandria.schemas \ + ${LOCALBASE}/etc/gconf/schemas/ +.if !defined(NOPORTDOCS) + @${MKDIR} ${RUBY_MODDOCDIR} +.for f in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ +.endfor +.endif .include <bsd.port.post.mk> diff --git a/deskutils/alexandria/pkg-plist b/deskutils/alexandria/pkg-plist index a3603f7..7b12ce3 100644 --- a/deskutils/alexandria/pkg-plist +++ b/deskutils/alexandria/pkg-plist @@ -1,33 +1,54 @@ bin/alexandria %%RUBY_SITELIBDIR%%/alexandria.rb %%RUBY_SITELIBDIR%%/alexandria/book.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers/amadeus.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers/amazon.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers/bn.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers/ibs_it.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers/mcu.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers/proxis.rb +%%RUBY_SITELIBDIR%%/alexandria/book_providers/z3950.rb +%%RUBY_SITELIBDIR%%/alexandria/config.rb +%%RUBY_SITELIBDIR%%/alexandria/default_preferences.rb %%RUBY_SITELIBDIR%%/alexandria/execution_queue.rb %%RUBY_SITELIBDIR%%/alexandria/export_library.rb %%RUBY_SITELIBDIR%%/alexandria/import_library.rb %%RUBY_SITELIBDIR%%/alexandria/library.rb -%%RUBY_SITELIBDIR%%/alexandria/preferences.rb -%%RUBY_SITELIBDIR%%/alexandria/ui.rb -%%RUBY_SITELIBDIR%%/alexandria/web_themes.rb %%RUBY_SITELIBDIR%%/alexandria/macui.rb -%%RUBY_SITELIBDIR%%/alexandria/utils.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/AboutController.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/AddBookController.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/BookIconCell.m +%%RUBY_SITELIBDIR%%/alexandria/macui/BookInfoController.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/BooksDataSource.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/ExportController.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/Icons.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/ImportController.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/Info.plist +%%RUBY_SITELIBDIR%%/alexandria/macui/LibrariesDataSource.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/MainController.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/classes.nib +%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/info.nib +%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/keyedobjects.nib +%%RUBY_SITELIBDIR%%/alexandria/macui/Matrix.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/PreferencesController.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/RatingCell.m +%%RUBY_SITELIBDIR%%/alexandria/macui/RatingField.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/TableView.rb +%%RUBY_SITELIBDIR%%/alexandria/macui/TitledImageCell.m +%%RUBY_SITELIBDIR%%/alexandria/macui/Utils.m +%%RUBY_SITELIBDIR%%/alexandria/macui/main.m +%%RUBY_SITELIBDIR%%/alexandria/macui/main.rb +%%RUBY_SITELIBDIR%%/alexandria/preferences.rb %%RUBY_SITELIBDIR%%/alexandria/scanners.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers.rb -%%RUBY_SITELIBDIR%%/alexandria/default_preferences.rb -%%RUBY_SITELIBDIR%%/alexandria/config.rb -%%RUBY_SITELIBDIR%%/alexandria/version.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers/mcu.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers/amazon.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers/bn.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers/proxis.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers/amadeus.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers/ibs_it.rb -%%RUBY_SITELIBDIR%%/alexandria/book_providers/z3950.rb %%RUBY_SITELIBDIR%%/alexandria/scanners/cuecat.rb -%%RUBY_SITELIBDIR%%/alexandria/ui/export_dialog.rb +%%RUBY_SITELIBDIR%%/alexandria/ui.rb %%RUBY_SITELIBDIR%%/alexandria/ui/about_dialog.rb %%RUBY_SITELIBDIR%%/alexandria/ui/alert_dialog.rb %%RUBY_SITELIBDIR%%/alexandria/ui/book_properties_dialog.rb %%RUBY_SITELIBDIR%%/alexandria/ui/book_properties_dialog_base.rb +%%RUBY_SITELIBDIR%%/alexandria/ui/completion_models.rb +%%RUBY_SITELIBDIR%%/alexandria/ui/export_dialog.rb %%RUBY_SITELIBDIR%%/alexandria/ui/glade_base.rb %%RUBY_SITELIBDIR%%/alexandria/ui/icons.rb %%RUBY_SITELIBDIR%%/alexandria/ui/import_dialog.rb @@ -35,61 +56,43 @@ bin/alexandria %%RUBY_SITELIBDIR%%/alexandria/ui/new_book_dialog.rb %%RUBY_SITELIBDIR%%/alexandria/ui/new_book_dialog_manual.rb %%RUBY_SITELIBDIR%%/alexandria/ui/preferences_dialog.rb -%%RUBY_SITELIBDIR%%/alexandria/ui/completion_models.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/AddBookController.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/BookInfoController.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/BooksDataSource.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/Info.plist -%%RUBY_SITELIBDIR%%/alexandria/macui/LibrariesDataSource.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/MainController.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/RatingCell.m -%%RUBY_SITELIBDIR%%/alexandria/macui/TableView.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/TitledImageCell.m -%%RUBY_SITELIBDIR%%/alexandria/macui/main.m -%%RUBY_SITELIBDIR%%/alexandria/macui/main.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/AboutController.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/BookIconCell.m -%%RUBY_SITELIBDIR%%/alexandria/macui/ExportController.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/Icons.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/ImportController.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/Matrix.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/PreferencesController.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/RatingField.rb -%%RUBY_SITELIBDIR%%/alexandria/macui/Utils.m -%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/classes.nib -%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/info.nib -%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/keyedobjects.nib +%%RUBY_SITELIBDIR%%/alexandria/utils.rb +%%RUBY_SITELIBDIR%%/alexandria/version.rb +%%RUBY_SITELIBDIR%%/alexandria/web_themes.rb %%DATADIR%%/glade/book_properties_dialog.glade +%%DATADIR%%/glade/main_app.glade %%DATADIR%%/glade/new_book_dialog.glade %%DATADIR%%/glade/preferences_dialog.glade -%%DATADIR%%/glade/main_app.glade %%DATADIR%%/icons/alexandria.png %%DATADIR%%/icons/alexandria_small.png %%DATADIR%%/icons/book.png +%%DATADIR%%/icons/book_icon.png +%%DATADIR%%/icons/book_small.png %%DATADIR%%/icons/cuecat.png %%DATADIR%%/icons/cuecat_inactive.png -%%DATADIR%%/icons/library.png -%%DATADIR%%/icons/library_small.png -%%DATADIR%%/icons/star_set.png -%%DATADIR%%/icons/star_unset.png %%DATADIR%%/icons/favorite_tag.png -%%DATADIR%%/icons/book_small.png -%%DATADIR%%/icons/book_icon.png %%DATADIR%%/icons/less.png +%%DATADIR%%/icons/library.png +%%DATADIR%%/icons/library_small.png +%%DATADIR%%/icons/lookup.png %%DATADIR%%/icons/more.png %%DATADIR%%/icons/no_cover.png +%%DATADIR%%/icons/star_set.png +%%DATADIR%%/icons/star_unset.png %%DATADIR%%/icons/view_as_icons.png %%DATADIR%%/icons/view_as_list.png -%%DATADIR%%/icons/lookup.png %%DATADIR%%/ui/menus.xml %%DATADIR%%/ui/popups.xml %%DATADIR%%/web-themes/clean/clean.css %%DATADIR%%/web-themes/clean/preview.jpg -share/omf/alexandria/alexandria-C.omf +%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS +%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README +%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO share/gnome/help/alexandria/C/alexandria.xml share/gnome/help/alexandria/C/figures/alexandria_add_by_isbn_1.png share/gnome/help/alexandria/C/figures/alexandria_add_by_search_1.png share/gnome/help/alexandria/C/figures/alexandria_add_manually.png +share/gnome/help/alexandria/C/figures/alexandria_add_z3950.png share/gnome/help/alexandria/C/figures/alexandria_edit_info.png share/gnome/help/alexandria/C/figures/alexandria_export_web_page.png share/gnome/help/alexandria/C/figures/alexandria_importing.png @@ -98,25 +101,24 @@ share/gnome/help/alexandria/C/figures/alexandria_list_view.png share/gnome/help/alexandria/C/figures/alexandria_list_view_search.png share/gnome/help/alexandria/C/figures/alexandria_loaning.png share/gnome/help/alexandria/C/figures/alexandria_main_window.png -share/gnome/help/alexandria/C/figures/alexandria_add_z3950.png -share/locale/sv/LC_MESSAGES/alexandria.mo -share/locale/fr/LC_MESSAGES/alexandria.mo -share/locale/de/LC_MESSAGES/alexandria.mo +share/gnome/help/alexandria/ChangeLog +share/gnome/omf/alexandria/alexandria-C.omf +share/locale/cs/LC_MESSAGES/alexandria.mo share/locale/cy/LC_MESSAGES/alexandria.mo +share/locale/de/LC_MESSAGES/alexandria.mo share/locale/es/LC_MESSAGES/alexandria.mo -share/locale/pl/LC_MESSAGES/alexandria.mo -share/locale/pt_BR/LC_MESSAGES/alexandria.mo +share/locale/fr/LC_MESSAGES/alexandria.mo share/locale/it/LC_MESSAGES/alexandria.mo share/locale/ja/LC_MESSAGES/alexandria.mo +share/locale/pl/LC_MESSAGES/alexandria.mo share/locale/pt/LC_MESSAGES/alexandria.mo -share/locale/cs/LC_MESSAGES/alexandria.mo -@dirrm share/omf/alexandria -@dirrm share/omf +share/locale/pt_BR/LC_MESSAGES/alexandria.mo +share/locale/sv/LC_MESSAGES/alexandria.mo +@dirrm share/gnome/omf/alexandria @dirrm share/gnome/help/alexandria/C/figures @dirrm share/gnome/help/alexandria/C @dirrm share/gnome/help/alexandria -@dirrm share/gnome/help -@dirrm share/gnome +@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%% @dirrm %%DATADIR%%/web-themes/clean @dirrm %%DATADIR%%/web-themes @dirrm %%DATADIR%%/ui @@ -129,6 +131,9 @@ share/locale/cs/LC_MESSAGES/alexandria.mo @dirrm %%RUBY_SITELIBDIR%%/alexandria/macui @dirrm %%RUBY_SITELIBDIR%%/alexandria/book_providers @dirrm %%RUBY_SITELIBDIR%%/alexandria -@dirrm %%RUBY_SITELIBDIR%% -@dirrm lib/ruby/site_ruby -@dirrm lib/ruby +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/deskutils/buoh/Makefile b/deskutils/buoh/Makefile index 1769c5c..06ead61 100644 --- a/deskutils/buoh/Makefile +++ b/deskutils/buoh/Makefile @@ -7,7 +7,7 @@ PORTNAME= buoh PORTVERSION= 0.8.1 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= deskutils www gnome MASTER_SITES= http://buoh.steve-o.org/downloads/ @@ -18,7 +18,7 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui -USE_X_PREFIX= yes +USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -46,7 +46,7 @@ pre-everything:: .endif post-patch: - @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${X11BASE}/share/applications|g' \ + @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${LOCALBASE}/share/applications|g' \ ${WRKSRC}/data/Makefile.in post-install: @@ -56,7 +56,8 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif + @${MKDIR} ${LOCALBASE}/share/pixmaps @${LN} -sf ${DATADIR}/pixmaps/buoh64x64.png \ - ${X11BASE}/share/pixmaps/buoh64x64.png + ${LOCALBASE}/share/pixmaps/buoh64x64.png .include <bsd.port.post.mk> diff --git a/deskutils/buoh/pkg-plist b/deskutils/buoh/pkg-plist index 9ab5c41..f1923d8 100644 --- a/deskutils/buoh/pkg-plist +++ b/deskutils/buoh/pkg-plist @@ -11,6 +11,7 @@ share/applications/buoh.desktop %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO share/pixmaps/buoh64x64.png +@dirrmtry share/pixmaps %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/pixmaps diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile index 2424997..b9e5484 100644 --- a/deskutils/contacts/Makefile +++ b/deskutils/contacts/Makefile @@ -7,6 +7,7 @@ PORTNAME= contacts PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= http://www.openedhand.com/~chris/ \ http://smyru.petronet.pl/freebsd/ diff --git a/deskutils/contacts/files/patch-src_constacts-utils.c b/deskutils/contacts/files/patch-src_constacts-utils.c new file mode 100644 index 0000000..605a374 --- /dev/null +++ b/deskutils/contacts/files/patch-src_constacts-utils.c @@ -0,0 +1,44 @@ +--- src/contacts-utils.c.orig Sat Sep 30 02:02:40 2006 ++++ src/contacts-utils.c Sat Sep 30 02:03:54 2006 +@@ -180,13 +180,13 @@ + + /* TODO: Would adding a struct for this be gratuititous? RB: NOT AT ALL */ + static const gchar **contacts_field_types[] = { +- (gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax", ++ (const gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax", + "Cell", "Video", "Pager", "BBS", "Modem", "Car", + "ISDN", "PCS", NULL }, +- (gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL }, +- (gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work", ++ (const gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL }, ++ (const gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work", + "Pref", NULL }, +- (gchar *[]){ NULL } ++ (const gchar *[]){ NULL } + }; + + const gchar ** +@@ -357,8 +357,8 @@ + switch (photo->type) { + case E_CONTACT_PHOTO_TYPE_INLINED : + gdk_pixbuf_loader_write (loader, +- photo->inlined.data, +- photo->inlined.length, NULL); ++ photo->data.inlined.data, ++ photo->data.inlined.length, NULL); + break; + case E_CONTACT_PHOTO_TYPE_URI : + default : +@@ -545,9 +545,9 @@ + int *length; + #if HAVE_PHOTO_TYPE + new_photo.type = E_CONTACT_PHOTO_TYPE_INLINED; +- data = &new_photo.inlined.data; +- length = &new_photo.inlined.length; +- new_photo.inlined.mime_type = NULL; ++ data = &new_photo.data.inlined.data; ++ length = &new_photo.data.inlined.length; ++ new_photo.data.inlined.mime_type = NULL; + #else + data = &new_photo.data; + length = &new_photo.length; diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile index a6377d6..8a8a69e 100644 --- a/deskutils/drivel/Makefile +++ b/deskutils/drivel/Makefile @@ -7,7 +7,7 @@ PORTNAME= drivel PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,6 +17,7 @@ COMMENT= Blog editor for GNOME LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl +INSTALLS_ICONS= yes USE_X_PREFIX= yes USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack libgnomeui intlhack gtksourceview diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist index fc17891..42f07a1 100644 --- a/deskutils/drivel/pkg-plist +++ b/deskutils/drivel/pkg-plist @@ -61,6 +61,8 @@ share/mime/application/x-drivel.xml share/mime/packages/drivel.xml @unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true +@dirrmtry share/icons/gnome/48x48/mimetypes +@dirrmtry share/icons/gnome/48x48 @dirrm share/gnome/pixmaps/drivel @dirrm share/gnome/omf/drivel @dirrm share/gnome/help/drivel/C @@ -70,3 +72,21 @@ share/mime/packages/drivel.xml @dirrm share/gnome/drivel @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile index c177b2c..6663ad8 100644 --- a/deskutils/gdeskcal-skins/Makefile +++ b/deskutils/gdeskcal-skins/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdeskcal-skins PORTVERSION= 0.56 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils python gnome MASTER_SITES= http://www.pycage.de/download/skins/gdeskcal/ DISTNAME= @@ -30,10 +30,10 @@ DISTFILES= gnometheme.tar.gz \ MAINTAINER= ports@FreeBSD.org COMMENT= Skins for gdeskcal -RUN_DEPENDS= ${X11BASE}/bin/gdeskcal:${PORTSDIR}/deskutils/gdeskcal +RUN_DEPENDS= gdeskcal:${PORTSDIR}/deskutils/gdeskcal USE_PYTHON= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GNOME= gnomeprefix NO_BUILD= yes diff --git a/deskutils/gdeskcal/Makefile b/deskutils/gdeskcal/Makefile index 85fe7cc..87184f1 100644 --- a/deskutils/gdeskcal/Makefile +++ b/deskutils/gdeskcal/Makefile @@ -3,11 +3,11 @@ # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # # $FreeBSD$ -# +# $MCom: ports/deskutils/gdeskcal/Makefile,v 1.2 2006/09/30 03:23:19 ahze Exp $ PORTNAME= gdeskcal PORTVERSION= 0.57.1 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= deskutils python gnome MASTER_SITES= http://www.pycage.de/download/ DISTNAME= gDeskCal-${PORTVERSION:S/./_/g} @@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/gDeskCal-${PORTVERSION} USE_PYTHON= yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= gnomehier NO_BUILD= yes diff --git a/deskutils/gdeskcal/pkg-plist b/deskutils/gdeskcal/pkg-plist index 191d32e..eef2330 100644 --- a/deskutils/gdeskcal/pkg-plist +++ b/deskutils/gdeskcal/pkg-plist @@ -99,3 +99,25 @@ share/locale/zh_CN/LC_MESSAGES/gdeskcal.mo @dirrm share/gnome/gdeskcal/code/planner @dirrm share/gnome/gdeskcal/code @dirrm share/gnome/gdeskcal +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/de_AT/LC_MESSAGES +@dirrmtry share/locale/de_AT +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/deskutils/gdesklets-recentlyused/Makefile b/deskutils/gdesklets-recentlyused/Makefile index 6ae61d6..1669238 100644 --- a/deskutils/gdesklets-recentlyused/Makefile +++ b/deskutils/gdesklets-recentlyused/Makefile @@ -7,7 +7,7 @@ PORTNAME= recentlyused PORTVERSION= 0.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -19,7 +19,7 @@ COMMENT= A toolbar for the most recently used items from ~/.recently-used RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets USE_PYTHON= yes -USE_X_PREFIX= yes +USE_XLIB= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/deskutils/gdesklets-sensor-displayconstraints/Makefile b/deskutils/gdesklets-sensor-displayconstraints/Makefile index 26a024b..cad18a3 100644 --- a/deskutils/gdesklets-sensor-displayconstraints/Makefile +++ b/deskutils/gdesklets-sensor-displayconstraints/Makefile @@ -7,7 +7,7 @@ PORTNAME= displayconstraints PORTVERSION= 0.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets-sensor- @@ -24,7 +24,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets WRKSRC= ${WRKDIR}/${NAME}-${PORTVERSION} USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_PYTHON= yes NAME= DisplayConstraints diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile index 555f85b..e638a38 100644 --- a/deskutils/gdesklets-starterbar/Makefile +++ b/deskutils/gdesklets-starterbar/Makefile @@ -7,7 +7,7 @@ PORTNAME= starterbar PORTVERSION= 0.31.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -21,7 +21,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \ USE_BZIP2= yes USE_PYTHON= yes -USE_X_PREFIX= yes +USE_XLIB= yes NAME= StarterBar DATADIR= ${PREFIX}/share/gnome diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile index 1c540c4..a98cbbd 100644 --- a/deskutils/gdesklets/Makefile +++ b/deskutils/gdesklets/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdesklets PORTVERSION= 0.35.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= http://www.gdesklets.org/downloads/ \ http://www.pycage.de/download/${PORTNAME}/ \ @@ -19,6 +19,7 @@ COMMENT= A framework for Gnome 2.x for desktop applets LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop +INSTALLS_ICONS= yes USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist index eae6405..5c5dfeb 100644 --- a/deskutils/gdesklets/pkg-plist +++ b/deskutils/gdesklets/pkg-plist @@ -650,5 +650,30 @@ share/mime/packages/gdesklets.xml @dirrm lib/gdesklets @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/icons/gnome/48x48/mimetypes diff --git a/deskutils/gnome-menu-editor/Makefile b/deskutils/gnome-menu-editor/Makefile index f60d410..214609d 100644 --- a/deskutils/gnome-menu-editor/Makefile +++ b/deskutils/gnome-menu-editor/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-menu-editor/Makefile,v 1.8 2005/09/08 18:09:45 marcus Exp $ +# $MCom: ports/deskutils/gnome-menu-editor/Makefile,v 1.11 2006/09/01 20:29:54 ahze Exp $ # PORTNAME= gnome-menu-editor PORTVERSION= 0.6 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://manny.cluecoder.org/packages/gnome-menu-editor/ @@ -17,12 +18,14 @@ COMMENT= Simple menu editor for Gnome USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomemenus intlhack USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: + @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \ + ${WRKSRC}/src/gme-util.c # Make .desktop file valid to desktop-file-validate @${REINPLACE_CMD} -e 's|OnlyShowIn=GNOME|OnlyShowIn=GNOME;|' \ ${WRKSRC}/data/gnome-menu-editor.desktop.in diff --git a/deskutils/gnome-menu-editor/pkg-plist b/deskutils/gnome-menu-editor/pkg-plist index d414b40..45ce031 100644 --- a/deskutils/gnome-menu-editor/pkg-plist +++ b/deskutils/gnome-menu-editor/pkg-plist @@ -29,5 +29,25 @@ share/locale/uk/LC_MESSAGES/gnome-menu-editor.mo share/locale/vi/LC_MESSAGES/gnome-menu-editor.mo share/locale/zh_CN/LC_MESSAGES/gnome-menu-editor.mo share/locale/zh_TW/LC_MESSAGES/gnome-menu-editor.mo +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile index 721736c..ed85444 100644 --- a/deskutils/lightning-thunderbird/Makefile +++ b/deskutils/lightning-thunderbird/Makefile @@ -3,16 +3,15 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $ # PORTNAME= sunbird -PORTVERSION= 0.3a1 -PORTREVISION= 2 +PORTVERSION= 0.3 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}-source +MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gnome@FreeBSD.org COMMENT= Redesign of the Mozilla Calendar with XUL interface @@ -24,19 +23,20 @@ HAS_CONFIGURE= yes USE_GMAKE= yes USE_BZIP2= yes WANT_GNOME= yes -USE_X_PREFIX= yes SUNBIRD= ${PORTNAME} SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm SUNBIRD_ICON= ${PORTNAME}.xpm - -MOZ_PROTOCOLS= about,http,ftp,file,jar,res +LIBS= -Wl,-Bsymbolic -lc +PKGCONFIG_FILES?= ${MOZILLA}-js \ + ${MOZILLA}-xpcom ${MOZILLA}-plugin MOZ_OPTIONS= --enable-application=calendar \ - --enable-plaintext-editor-only \ - --disable-plugins --disable-cookies + --enable-system-cairo \ + --with-system-nss \ + --enable-canvas MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar .include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .if ${OSVERSION} < 500000 BROKEN= does not build @@ -50,21 +50,16 @@ IGNORE= does not build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -post-extract:: +post-patch: @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop - -post-patch: -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/security/manager/ssl/src/Makefile.in pre-install: ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} do-install: diff --git a/deskutils/lightning-thunderbird/distinfo b/deskutils/lightning-thunderbird/distinfo index 9a9b070..6da5658 100644 --- a/deskutils/lightning-thunderbird/distinfo +++ b/deskutils/lightning-thunderbird/distinfo @@ -1,3 +1,3 @@ -MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3 -SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda -SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798 +MD5 (sunbird-0.3.source.tar.bz2) = 5579069a44e382bb963e3bbf6897a366 +SHA256 (sunbird-0.3.source.tar.bz2) = e359a61363971ef8a7ab33ebfc9c645a03ad32f71ebcc3b6f414737d22b40224 +SIZE (sunbird-0.3.source.tar.bz2) = 32564480 diff --git a/deskutils/lightning-thunderbird/files/patch-Makefile.in b/deskutils/lightning-thunderbird/files/patch-Makefile.in deleted file mode 100644 index b09d564..0000000 --- a/deskutils/lightning-thunderbird/files/patch-Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.in.orig Thu Oct 21 19:25:55 2004 -+++ Makefile.in Thu Oct 21 19:26:46 2004 -@@ -80,8 +80,7 @@ - $(tier_1_dirs) \ - $(tier_2_dirs) \ - $(tier_9_dirs) \ -- $(tier_50_dirs) \ -- $(NULL) -+ $(tier_50_dirs) - - ifdef GC_LEAK_DETECTOR - DIRS += gc/boehm -@@ -100,7 +99,8 @@ - DIRS += $(tier_98_dirs) - endif - --DIRS += $(tier_99_dirs) -+DIRS += $(tier_99_dirs) \ -+ $(NULL) - - # - # tier 0 - base build config dirs diff --git a/deskutils/lightning-thunderbird/files/patch-config_rules.mk b/deskutils/lightning-thunderbird/files/patch-config_rules.mk index 16cb6ae..7377726 100644 --- a/deskutils/lightning-thunderbird/files/patch-config_rules.mk +++ b/deskutils/lightning-thunderbird/files/patch-config_rules.mk @@ -1,14 +1,11 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ +--- config/rules.mk.orig Fri Jul 7 00:13:36 2006 ++++ config/rules.mk Sun Sep 3 00:04:03 2006 +@@ -443,7 +443,7 @@ ifeq ($(OS_ARCH),FreeBSD) ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) +-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif endif endif diff --git a/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h b/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h new file mode 100644 index 0000000..534bccb --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h @@ -0,0 +1,20 @@ +--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006 ++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006 +@@ -41,7 +41,7 @@ + #define __txdouble_h__ + + //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ ++/* #ifdef __FreeBSD__ + #include <ieeefp.h> + #ifdef __alpha__ + fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +@@ -50,7 +50,7 @@ + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif +- ++*/ + /** + * Macros to workaround math-bugs bugs in various platforms + */ diff --git a/deskutils/lightning-thunderbird/files/patch-content_xslt_src_base_txDouble.cpp b/deskutils/lightning-thunderbird/files/patch-content_xslt_src_base_txDouble.cpp deleted file mode 100644 index 6795f92..0000000 --- a/deskutils/lightning-thunderbird/files/patch-content_xslt_src_base_txDouble.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- content/xslt/src/base/txDouble.cpp.orig Mon Feb 6 15:40:52 2006 -+++ content/xslt/src/base/txDouble.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/deskutils/lightning-thunderbird/files/patch-libm b/deskutils/lightning-thunderbird/files/patch-libm deleted file mode 100644 index 7de64b2..0000000 --- a/deskutils/lightning-thunderbird/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite b/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite new file mode 100644 index 0000000..1b1bbbc --- /dev/null +++ b/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite @@ -0,0 +1,12 @@ +--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 ++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 +@@ -99,7 +99,8 @@ + # REFEF_IO allows us to override IO functions, which is used in the AsyncIO + # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we + # don't have to vacuum to make sure the data is not visible in the file. +-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 ++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 ++# -DTHREADSAFE=1 + + ifdef ENABLE_TESTS + ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) diff --git a/deskutils/lightning-thunderbird/files/patch-sysnss b/deskutils/lightning-thunderbird/files/patch-sysnss index a9154ce..f1397eb 100644 --- a/deskutils/lightning-thunderbird/files/patch-sysnss +++ b/deskutils/lightning-thunderbird/files/patch-sysnss @@ -1,103 +1,55 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) +--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 ++++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 +@@ -124,19 +124,19 @@ + pipboot \ + $(NULL) ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif +-EXTRA_DEPS = $(NSS_DEP_LIBS) --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = + DEFINES += -DNSS_ENABLE_ECC - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += $(NSS_CFLAGS) ++LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } + EXTRA_DSO_LDOPTS += \ + $(MOZ_UNICHARUTIL_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NSS_LIBS) \ ++ $(LOCAL_INCLUDES) \ + $(NULL) -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); ---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 -+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 -@@ -52,18 +52,9 @@ + include $(topsrcdir)/config/rules.mk +--- security/manager/Makefile.in.orig Thu Jun 22 14:47:38 2006 ++++ security/manager/Makefile.in Thu Oct 12 23:54:37 2006 +@@ -54,22 +54,13 @@ SSL3_LIB \ SOFTOKEN3_LIB \ SOFTOKEN3_CHK \ - LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ + HAVE_FREEBL_LIBS \ + HAVE_FREEBL_LIBS_32 \ + HAVE_FREEBL_LIBS_32INT64 \ + HAVE_FREEBL_LIBS_64 \ $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) + endif + -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk - - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) - ifndef HAVE_64BIT_OS -@@ -151,11 +142,6 @@ + # Default + HAVE_FREEBL_LIBS = 1 +@@ -217,11 +208,6 @@ .nss.cleaned: .nss.checkout + ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK @@ -105,26 +57,66 @@ - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif touch $@ - - .nss.checkout: -@@ -176,10 +162,10 @@ - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) endif + +@@ -242,95 +228,16 @@ + + libs:: + ifndef MOZ_NATIVE_NSS +- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK +-ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - ifndef SKIP_CHK -@@ -203,20 +189,6 @@ +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin +-ifdef HAVE_FREEBL_LIBS +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_32 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_32INT64 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_64 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin +-endif +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + $(MAKE) -C locales $@ + ifdef MOZ_XUL + $(MAKE) -C pki $@ endif ++endif install:: + ifndef MOZ_NATIVE_NSS - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) @@ -133,24 +125,47 @@ - $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +-ifdef HAVE_FREEBL_LIBS +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_32 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_32INT64 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_64 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) -endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) +-endif + endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -232,11 +204,6 @@ +@@ -347,12 +254,6 @@ $(MAKE) -C pki $@ endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean + ifndef MOZ_NATIVE_NSS +- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif + endif echo-requires-recursive:: - $(MAKE) -C boot $@ diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile index 721736c..ed85444 100644 --- a/deskutils/lightning/Makefile +++ b/deskutils/lightning/Makefile @@ -3,16 +3,15 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $ # PORTNAME= sunbird -PORTVERSION= 0.3a1 -PORTREVISION= 2 +PORTVERSION= 0.3 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}-source +MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gnome@FreeBSD.org COMMENT= Redesign of the Mozilla Calendar with XUL interface @@ -24,19 +23,20 @@ HAS_CONFIGURE= yes USE_GMAKE= yes USE_BZIP2= yes WANT_GNOME= yes -USE_X_PREFIX= yes SUNBIRD= ${PORTNAME} SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm SUNBIRD_ICON= ${PORTNAME}.xpm - -MOZ_PROTOCOLS= about,http,ftp,file,jar,res +LIBS= -Wl,-Bsymbolic -lc +PKGCONFIG_FILES?= ${MOZILLA}-js \ + ${MOZILLA}-xpcom ${MOZILLA}-plugin MOZ_OPTIONS= --enable-application=calendar \ - --enable-plaintext-editor-only \ - --disable-plugins --disable-cookies + --enable-system-cairo \ + --with-system-nss \ + --enable-canvas MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar .include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .if ${OSVERSION} < 500000 BROKEN= does not build @@ -50,21 +50,16 @@ IGNORE= does not build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -post-extract:: +post-patch: @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop - -post-patch: -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/security/manager/ssl/src/Makefile.in pre-install: ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} do-install: diff --git a/deskutils/lightning/distinfo b/deskutils/lightning/distinfo index 9a9b070..6da5658 100644 --- a/deskutils/lightning/distinfo +++ b/deskutils/lightning/distinfo @@ -1,3 +1,3 @@ -MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3 -SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda -SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798 +MD5 (sunbird-0.3.source.tar.bz2) = 5579069a44e382bb963e3bbf6897a366 +SHA256 (sunbird-0.3.source.tar.bz2) = e359a61363971ef8a7ab33ebfc9c645a03ad32f71ebcc3b6f414737d22b40224 +SIZE (sunbird-0.3.source.tar.bz2) = 32564480 diff --git a/deskutils/lightning/files/patch-Makefile.in b/deskutils/lightning/files/patch-Makefile.in deleted file mode 100644 index b09d564..0000000 --- a/deskutils/lightning/files/patch-Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.in.orig Thu Oct 21 19:25:55 2004 -+++ Makefile.in Thu Oct 21 19:26:46 2004 -@@ -80,8 +80,7 @@ - $(tier_1_dirs) \ - $(tier_2_dirs) \ - $(tier_9_dirs) \ -- $(tier_50_dirs) \ -- $(NULL) -+ $(tier_50_dirs) - - ifdef GC_LEAK_DETECTOR - DIRS += gc/boehm -@@ -100,7 +99,8 @@ - DIRS += $(tier_98_dirs) - endif - --DIRS += $(tier_99_dirs) -+DIRS += $(tier_99_dirs) \ -+ $(NULL) - - # - # tier 0 - base build config dirs diff --git a/deskutils/lightning/files/patch-config_rules.mk b/deskutils/lightning/files/patch-config_rules.mk index 16cb6ae..7377726 100644 --- a/deskutils/lightning/files/patch-config_rules.mk +++ b/deskutils/lightning/files/patch-config_rules.mk @@ -1,14 +1,11 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ +--- config/rules.mk.orig Fri Jul 7 00:13:36 2006 ++++ config/rules.mk Sun Sep 3 00:04:03 2006 +@@ -443,7 +443,7 @@ ifeq ($(OS_ARCH),FreeBSD) ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) +-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif endif endif diff --git a/deskutils/lightning/files/patch-content_xslt_public_txDouble.h b/deskutils/lightning/files/patch-content_xslt_public_txDouble.h new file mode 100644 index 0000000..534bccb --- /dev/null +++ b/deskutils/lightning/files/patch-content_xslt_public_txDouble.h @@ -0,0 +1,20 @@ +--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006 ++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006 +@@ -41,7 +41,7 @@ + #define __txdouble_h__ + + //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ ++/* #ifdef __FreeBSD__ + #include <ieeefp.h> + #ifdef __alpha__ + fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +@@ -50,7 +50,7 @@ + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif +- ++*/ + /** + * Macros to workaround math-bugs bugs in various platforms + */ diff --git a/deskutils/lightning/files/patch-content_xslt_src_base_txDouble.cpp b/deskutils/lightning/files/patch-content_xslt_src_base_txDouble.cpp deleted file mode 100644 index 6795f92..0000000 --- a/deskutils/lightning/files/patch-content_xslt_src_base_txDouble.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- content/xslt/src/base/txDouble.cpp.orig Mon Feb 6 15:40:52 2006 -+++ content/xslt/src/base/txDouble.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/deskutils/lightning/files/patch-libm b/deskutils/lightning/files/patch-libm deleted file mode 100644 index 7de64b2..0000000 --- a/deskutils/lightning/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/deskutils/lightning/files/patch-nothreads-sqlite b/deskutils/lightning/files/patch-nothreads-sqlite new file mode 100644 index 0000000..1b1bbbc --- /dev/null +++ b/deskutils/lightning/files/patch-nothreads-sqlite @@ -0,0 +1,12 @@ +--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 ++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 +@@ -99,7 +99,8 @@ + # REFEF_IO allows us to override IO functions, which is used in the AsyncIO + # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we + # don't have to vacuum to make sure the data is not visible in the file. +-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 ++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 ++# -DTHREADSAFE=1 + + ifdef ENABLE_TESTS + ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) diff --git a/deskutils/lightning/files/patch-sysnss b/deskutils/lightning/files/patch-sysnss index a9154ce..f1397eb 100644 --- a/deskutils/lightning/files/patch-sysnss +++ b/deskutils/lightning/files/patch-sysnss @@ -1,103 +1,55 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) +--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 ++++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 +@@ -124,19 +124,19 @@ + pipboot \ + $(NULL) ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif +-EXTRA_DEPS = $(NSS_DEP_LIBS) --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = + DEFINES += -DNSS_ENABLE_ECC - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += $(NSS_CFLAGS) ++LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } + EXTRA_DSO_LDOPTS += \ + $(MOZ_UNICHARUTIL_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NSS_LIBS) \ ++ $(LOCAL_INCLUDES) \ + $(NULL) -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); ---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 -+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 -@@ -52,18 +52,9 @@ + include $(topsrcdir)/config/rules.mk +--- security/manager/Makefile.in.orig Thu Jun 22 14:47:38 2006 ++++ security/manager/Makefile.in Thu Oct 12 23:54:37 2006 +@@ -54,22 +54,13 @@ SSL3_LIB \ SOFTOKEN3_LIB \ SOFTOKEN3_CHK \ - LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ + HAVE_FREEBL_LIBS \ + HAVE_FREEBL_LIBS_32 \ + HAVE_FREEBL_LIBS_32INT64 \ + HAVE_FREEBL_LIBS_64 \ $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) + endif + -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk - - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) - ifndef HAVE_64BIT_OS -@@ -151,11 +142,6 @@ + # Default + HAVE_FREEBL_LIBS = 1 +@@ -217,11 +208,6 @@ .nss.cleaned: .nss.checkout + ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK @@ -105,26 +57,66 @@ - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif touch $@ - - .nss.checkout: -@@ -176,10 +162,10 @@ - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) endif + +@@ -242,95 +228,16 @@ + + libs:: + ifndef MOZ_NATIVE_NSS +- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK +-ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - ifndef SKIP_CHK -@@ -203,20 +189,6 @@ +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin +-ifdef HAVE_FREEBL_LIBS +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_32 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_32INT64 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_64 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin +-endif +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + $(MAKE) -C locales $@ + ifdef MOZ_XUL + $(MAKE) -C pki $@ endif ++endif install:: + ifndef MOZ_NATIVE_NSS - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) @@ -133,24 +125,47 @@ - $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +-ifdef HAVE_FREEBL_LIBS +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_32 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_32INT64 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_64 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) -endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) +-endif + endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -232,11 +204,6 @@ +@@ -347,12 +254,6 @@ $(MAKE) -C pki $@ endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean + ifndef MOZ_NATIVE_NSS +- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif + endif echo-requires-recursive:: - $(MAKE) -C boot $@ diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile index 139b310..4a41be0 100644 --- a/deskutils/mcatalog/Makefile +++ b/deskutils/mcatalog/Makefile @@ -8,7 +8,7 @@ PORTNAME= mcatalog PORTVERSION= 0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= http://www.mcatalog.net/releases/ @@ -39,7 +39,7 @@ post-patch: ${WRKSRC}/images/Makefile.in @${REINPLACE_CMD} -e 's|@prefix@/share|${PREFIX}/share/gnome|g' \ ${WRKSRC}/mcatalog.desktop.in - @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${X11BASE}/lib/${GECKO}|g' \ + @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${LOCALBASE}/lib/${GECKO}|g' \ ${WRKSRC}/src/mcatalog.in .ifndef (NOPORTDOCS) diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile index 621d542..3bd3f19 100644 --- a/deskutils/nautilus-actions/Makefile +++ b/deskutils/nautilus-actions/Makefile @@ -3,28 +3,27 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.4 2006/10/01 02:12:23 ahze Exp $ PORTNAME= nautilus-actions -PORTVERSION= 0.7.1 -PORTREVISION= 2 +PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ftp://ftp2.grumz.net/grumz/ MAINTAINER= ahze@FreeBSD.org COMMENT= Extension for Nautilus to configure programs to launch on files -USE_GNOME= nautilus2 intlhack pygtk2 +LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid + +INSTALLS_ICONS= yes +USE_GETTEXT= yes +USE_GNOME= nautilus2 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes -USE_PYTHON= yes -USE_X_PREFIX= yes +USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-nautilus-extdir=${X11BASE}/lib/nautilus/extensions-1.0 - -post-patch: - @${REINPLACE_CMD} -e 's|@datadir@datadir@/pixmaps|${DATADIR}/nact|' \ - ${WRKSRC}/nact/nact.desktop.in.in +CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-1.0 .include <bsd.port.mk> diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo index 74b7f4e..4c043f9 100644 --- a/deskutils/nautilus-actions/distinfo +++ b/deskutils/nautilus-actions/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-actions-0.7.1.tar.gz) = 98caa03d2d0616a9dd4a4c35c08d4502 -SHA256 (nautilus-actions-0.7.1.tar.gz) = 7456419bdc78953cd0321e0730574b063ec0d5e1ebe6839bd01c70b93be26dde -SIZE (nautilus-actions-0.7.1.tar.gz) = 397906 +MD5 (nautilus-actions-1.4.tar.gz) = c3434900718401e13432533eab10e681 +SHA256 (nautilus-actions-1.4.tar.gz) = 61f05fcf7557eda96c9f275de5fb132858e80c8b7a33b04fbd06caafff4b056b +SIZE (nautilus-actions-1.4.tar.gz) = 800222 diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist index fbb8286..9d25dff 100644 --- a/deskutils/nautilus-actions/pkg-plist +++ b/deskutils/nautilus-actions/pkg-plist @@ -1,14 +1,53 @@ bin/nautilus-actions-config +bin/nautilus-actions-convert +bin/nautilus-actions-new-config lib/nautilus/extensions-1.0/libnautilus-actions.la lib/nautilus/extensions-1.0/libnautilus-actions.so share/applications/nact.desktop +share/icons/hicolor/16x16/apps/nautilus-actions.png +share/icons/hicolor/22x22/apps/nautilus-actions.png +share/icons/hicolor/48x48/apps/nautilus-actions.png +share/icons/hicolor/scalable/apps/nautilus-actions.svg +share/locale/bg/LC_MESSAGES/nautilus-actions.mo +share/locale/bn/LC_MESSAGES/nautilus-actions.mo +share/locale/ca/LC_MESSAGES/nautilus-actions.mo +share/locale/cs/LC_MESSAGES/nautilus-actions.mo +share/locale/da/LC_MESSAGES/nautilus-actions.mo share/locale/de/LC_MESSAGES/nautilus-actions.mo +share/locale/en_CA/LC_MESSAGES/nautilus-actions.mo share/locale/es/LC_MESSAGES/nautilus-actions.mo +share/locale/fi/LC_MESSAGES/nautilus-actions.mo share/locale/fr/LC_MESSAGES/nautilus-actions.mo -%%DATADIR%%/config_newaction.xml -%%DATADIR%%/nact/nautilus-actions-config.glade -%%DATADIR%%/nact/nautilus-actions-icon.png -share/pixmaps/nautilus-actions-icon.png -@dirrmtry %%DATADIR%%/nact -@dirrmtry %%DATADIR%% -@dirrmtry share/applications +share/locale/gl/LC_MESSAGES/nautilus-actions.mo +share/locale/gu/LC_MESSAGES/nautilus-actions.mo +share/locale/he/LC_MESSAGES/nautilus-actions.mo +share/locale/ja/LC_MESSAGES/nautilus-actions.mo +share/locale/lt/LC_MESSAGES/nautilus-actions.mo +share/locale/lv/LC_MESSAGES/nautilus-actions.mo +share/locale/nb/LC_MESSAGES/nautilus-actions.mo +share/locale/nl/LC_MESSAGES/nautilus-actions.mo +share/locale/pa/LC_MESSAGES/nautilus-actions.mo +share/locale/pt_BR/LC_MESSAGES/nautilus-actions.mo +share/locale/sv/LC_MESSAGES/nautilus-actions.mo +share/locale/th/LC_MESSAGES/nautilus-actions.mo +share/locale/vi/LC_MESSAGES/nautilus-actions.mo +share/locale/zh_CN/LC_MESSAGES/nautilus-actions.mo +share/locale/zh_HK/LC_MESSAGES/nautilus-actions.mo +share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo +share/nautilus-actions/nact/nautilus-actions-config.glade +@dirrm share/nautilus-actions/nact +@dirrm share/nautilus-actions +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile index dd08404..1240529 100644 --- a/deskutils/nautilus-locked-folder/Makefile +++ b/deskutils/nautilus-locked-folder/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.2 2005/09/20 09:31:50 ahze Exp $ +# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.4 2006/07/18 12:22:24 ahze Exp $ # PORTNAME= nautilus-locked-folder PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils security MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav @@ -17,7 +17,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Nautilus plugin that allows you to encrypt the contents of a folder GNU_CONFIGURE= yes -USE_X_PREFIX= yes USE_GNOME= nautilus2 PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \ @@ -28,7 +27,7 @@ PLIST_FILES= lib/nautilus/extensions-1.0/libnautilus-locked-folder.a \ lib/nautilus/extensions-1.0/libnautilus-locked-folder.so post-patch: - @${REINPLACE_CMD} -e 's|/usr/share/icons/hicolor/32x32/stock/data/|${X11BASE}/share/icons/hicolor/32x32/stock/data/|' \ + @${REINPLACE_CMD} -e 's|/usr/share/icons/hicolor/32x32/stock/data/|${LOCALBASE}/share/icons/hicolor/32x32/stock/data/|' \ ${WRKSRC}/src/lockedfolder-extension.c .include <bsd.port.pre.mk> diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile index 99d9110..35fe306 100644 --- a/deskutils/nautilus-open-terminal/Makefile +++ b/deskutils/nautilus-open-terminal/Makefile @@ -3,22 +3,23 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.5 2005/10/08 19:41:16 marcus Exp $ +# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.7 2006/08/09 13:07:37 ahze Exp $ # PORTNAME= nautilus-open-terminal -PORTVERSION= 0.6 -PORTREVISION= 1 +PORTVERSION= 0.7 CATEGORIES= deskutils MASTER_SITES= http://manny.cluecoder.org/packages/nautilus-open-terminal/ MAINTAINER= gnome@FreeBSD.org COMMENT= Nautilus extension which allows you to open a terminal +USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_LDCONFIG= yes +USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/nautilus-open-terminal/distinfo b/deskutils/nautilus-open-terminal/distinfo index 8a4c95c..57846ca 100644 --- a/deskutils/nautilus-open-terminal/distinfo +++ b/deskutils/nautilus-open-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-open-terminal-0.6.tar.gz) = c4ffdd5bbae9f82be2696af6cb0eb7f5 -SHA256 (nautilus-open-terminal-0.6.tar.gz) = 66c91c009a53e8eb44b49bdd54759c6f461d5bfaf02be4cbd50fe349f29ec48a -SIZE (nautilus-open-terminal-0.6.tar.gz) = 346513 +MD5 (nautilus-open-terminal-0.7.tar.gz) = 318e9673017d9faf9a56aeeb74d36124 +SHA256 (nautilus-open-terminal-0.7.tar.gz) = 136adadbabed4b2436ddbff49f967c8dc17ad632aaaf1bff69f2fa17182e64eb +SIZE (nautilus-open-terminal-0.7.tar.gz) = 360315 diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist index 1dbc3c3..80add23 100644 --- a/deskutils/nautilus-open-terminal/pkg-plist +++ b/deskutils/nautilus-open-terminal/pkg-plist @@ -9,6 +9,7 @@ share/locale/de/LC_MESSAGES/nautilus-open-terminal.mo share/locale/en_CA/LC_MESSAGES/nautilus-open-terminal.mo share/locale/en_GB/LC_MESSAGES/nautilus-open-terminal.mo share/locale/es/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/eu/LC_MESSAGES/nautilus-open-terminal.mo share/locale/fi/LC_MESSAGES/nautilus-open-terminal.mo share/locale/fr/LC_MESSAGES/nautilus-open-terminal.mo share/locale/gl/LC_MESSAGES/nautilus-open-terminal.mo @@ -18,21 +19,52 @@ share/locale/it/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ja/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ko/LC_MESSAGES/nautilus-open-terminal.mo share/locale/lt/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/mk/LC_MESSAGES/nautilus-open-terminal.mo share/locale/nb/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ne/LC_MESSAGES/nautilus-open-terminal.mo share/locale/nl/LC_MESSAGES/nautilus-open-terminal.mo -share/locale/no/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/or/LC_MESSAGES/nautilus-open-terminal.mo share/locale/pa/LC_MESSAGES/nautilus-open-terminal.mo share/locale/pl/LC_MESSAGES/nautilus-open-terminal.mo share/locale/pt_BR/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/ro/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/ru/LC_MESSAGES/nautilus-open-terminal.mo share/locale/rw/LC_MESSAGES/nautilus-open-terminal.mo share/locale/sk/LC_MESSAGES/nautilus-open-terminal.mo share/locale/sr/LC_MESSAGES/nautilus-open-terminal.mo share/locale/sr@Latn/LC_MESSAGES/nautilus-open-terminal.mo share/locale/sv/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/th/LC_MESSAGES/nautilus-open-terminal.mo share/locale/tr/LC_MESSAGES/nautilus-open-terminal.mo share/locale/uk/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/vi/LC_MESSAGES/nautilus-open-terminal.mo share/locale/zh_CN/LC_MESSAGES/nautilus-open-terminal.mo share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile index b5b857e..5d5af3e 100644 --- a/deskutils/nautilus-sendto/Makefile +++ b/deskutils/nautilus-sendto/Makefile @@ -3,14 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.2 2006/02/24 05:52:41 marcus Exp $ +# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.5 2006/10/12 16:46:23 marcus Exp $ PORTNAME= nautilus-sendto -PORTVERSION= 0.5 -PORTREVISION= 1 +PORTVERSION= 0.8 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/nautilus-sendto/0.5 +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Integration between nautilus, evolution, and gaim @@ -20,10 +18,14 @@ BUILD_DEPENDS= gaim:${PORTSDIR}/net-im/gaim \ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim \ evolution:${PORTSDIR}/mail/evolution +MAN1= nautilus-sendto.1 +GCONF_SCHEMAS= nst.schemas USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo index 2b285a5..b0e85cb 100644 --- a/deskutils/nautilus-sendto/distinfo +++ b/deskutils/nautilus-sendto/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-sendto-0.5.tar.bz2) = e43a5e51270ef3e0f4743ed4d23f7409 -SHA256 (nautilus-sendto-0.5.tar.bz2) = 63709f0b8dc4c8006c9aa792b2898c3e956cb457b1c49e9e552d2fd1c4df7d38 -SIZE (nautilus-sendto-0.5.tar.bz2) = 268518 +MD5 (nautilus-sendto-0.8.tar.bz2) = 19165c7404c4956efd4366a8ebe3ddfa +SHA256 (nautilus-sendto-0.8.tar.bz2) = b046c9993029a0e5cc3976252420e5ba1413fa7174541a10815222a41c522c73 +SIZE (nautilus-sendto-0.8.tar.bz2) = 310098 diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist index 05f7ab5..7048347 100644 --- a/deskutils/nautilus-sendto/pkg-plist +++ b/deskutils/nautilus-sendto/pkg-plist @@ -1,14 +1,86 @@ bin/nautilus-sendto lib/gaim/nautilus.la lib/gaim/nautilus.so -lib/nautilus-sendto/plugins/libevolution.la -lib/nautilus-sendto/plugins/libevolution.so -lib/nautilus-sendto/plugins/libgaim.la -lib/nautilus-sendto/plugins/libgaim.so +lib/nautilus-sendto/plugins/libnstevolution.la +lib/nautilus-sendto/plugins/libnstevolution.so +lib/nautilus-sendto/plugins/libnstgaim.la +lib/nautilus-sendto/plugins/libnstgaim.so +lib/nautilus-sendto/plugins/libnstsylpheed.la +lib/nautilus-sendto/plugins/libnstsylpheed.so lib/nautilus/extensions-1.0/libnautilus-sendto.la lib/nautilus/extensions-1.0/libnautilus-sendto.so share/gnome/nautilus-sendto/glade/nautilus-sendto-force.glade share/gnome/nautilus-sendto/glade/nautilus-sendto.glade +share/locale/bg/LC_MESSAGES/nautilus-sendto.mo +share/locale/ca/LC_MESSAGES/nautilus-sendto.mo +share/locale/cs/LC_MESSAGES/nautilus-sendto.mo +share/locale/da/LC_MESSAGES/nautilus-sendto.mo +share/locale/de/LC_MESSAGES/nautilus-sendto.mo +share/locale/dz/LC_MESSAGES/nautilus-sendto.mo +share/locale/el/LC_MESSAGES/nautilus-sendto.mo +share/locale/en_CA/LC_MESSAGES/nautilus-sendto.mo +share/locale/en_GB/LC_MESSAGES/nautilus-sendto.mo +share/locale/es/LC_MESSAGES/nautilus-sendto.mo +share/locale/et/LC_MESSAGES/nautilus-sendto.mo +share/locale/eu/LC_MESSAGES/nautilus-sendto.mo +share/locale/fi/LC_MESSAGES/nautilus-sendto.mo +share/locale/fr/LC_MESSAGES/nautilus-sendto.mo +share/locale/gl/LC_MESSAGES/nautilus-sendto.mo +share/locale/he/LC_MESSAGES/nautilus-sendto.mo +share/locale/hu/LC_MESSAGES/nautilus-sendto.mo +share/locale/it/LC_MESSAGES/nautilus-sendto.mo +share/locale/ja/LC_MESSAGES/nautilus-sendto.mo +share/locale/ko/LC_MESSAGES/nautilus-sendto.mo +share/locale/lt/LC_MESSAGES/nautilus-sendto.mo +share/locale/mk/LC_MESSAGES/nautilus-sendto.mo +share/locale/nb/LC_MESSAGES/nautilus-sendto.mo +share/locale/ne/LC_MESSAGES/nautilus-sendto.mo +share/locale/nl/LC_MESSAGES/nautilus-sendto.mo +share/locale/or/LC_MESSAGES/nautilus-sendto.mo +share/locale/pa/LC_MESSAGES/nautilus-sendto.mo +share/locale/pl/LC_MESSAGES/nautilus-sendto.mo +share/locale/pt/LC_MESSAGES/nautilus-sendto.mo +share/locale/pt_BR/LC_MESSAGES/nautilus-sendto.mo +share/locale/ru/LC_MESSAGES/nautilus-sendto.mo +share/locale/rw/LC_MESSAGES/nautilus-sendto.mo +share/locale/sk/LC_MESSAGES/nautilus-sendto.mo +share/locale/sq/LC_MESSAGES/nautilus-sendto.mo +share/locale/sv/LC_MESSAGES/nautilus-sendto.mo +share/locale/th/LC_MESSAGES/nautilus-sendto.mo +share/locale/uk/LC_MESSAGES/nautilus-sendto.mo +share/locale/vi/LC_MESSAGES/nautilus-sendto.mo +share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo +share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca @dirrm share/gnome/nautilus-sendto/glade @dirrm share/gnome/nautilus-sendto @dirrm lib/nautilus-sendto/plugins diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index af73a6f..adfa26a 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -7,20 +7,20 @@ PORTNAME= notification-daemon PORTVERSION= 0.3.5 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/ MAINTAINER= andreas@syndrom23.de COMMENT= Send small notifications to your desktop -LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus \ +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sexy:${PORTSDIR}/x11-toolkits/libsexy \ popt.0:${PORTSDIR}/devel/popt -USE_GNOME= gnomehack gnometarget intlhack gconf2 libwnck +USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XLIB= yes GNU_CONFIGURE= yes GCONF_SCHEMAS= notification-daemon.schemas CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile index 721736c..ed85444 100644 --- a/deskutils/sunbird/Makefile +++ b/deskutils/sunbird/Makefile @@ -3,16 +3,15 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $ # PORTNAME= sunbird -PORTVERSION= 0.3a1 -PORTREVISION= 2 +PORTVERSION= 0.3 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}-source +MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gnome@FreeBSD.org COMMENT= Redesign of the Mozilla Calendar with XUL interface @@ -24,19 +23,20 @@ HAS_CONFIGURE= yes USE_GMAKE= yes USE_BZIP2= yes WANT_GNOME= yes -USE_X_PREFIX= yes SUNBIRD= ${PORTNAME} SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm SUNBIRD_ICON= ${PORTNAME}.xpm - -MOZ_PROTOCOLS= about,http,ftp,file,jar,res +LIBS= -Wl,-Bsymbolic -lc +PKGCONFIG_FILES?= ${MOZILLA}-js \ + ${MOZILLA}-xpcom ${MOZILLA}-plugin MOZ_OPTIONS= --enable-application=calendar \ - --enable-plaintext-editor-only \ - --disable-plugins --disable-cookies + --enable-system-cairo \ + --with-system-nss \ + --enable-canvas MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar .include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .if ${OSVERSION} < 500000 BROKEN= does not build @@ -50,21 +50,16 @@ IGNORE= does not build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -post-extract:: +post-patch: @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop - -post-patch: -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/security/manager/ssl/src/Makefile.in pre-install: ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} do-install: diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo index 9a9b070..6da5658 100644 --- a/deskutils/sunbird/distinfo +++ b/deskutils/sunbird/distinfo @@ -1,3 +1,3 @@ -MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3 -SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda -SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798 +MD5 (sunbird-0.3.source.tar.bz2) = 5579069a44e382bb963e3bbf6897a366 +SHA256 (sunbird-0.3.source.tar.bz2) = e359a61363971ef8a7ab33ebfc9c645a03ad32f71ebcc3b6f414737d22b40224 +SIZE (sunbird-0.3.source.tar.bz2) = 32564480 diff --git a/deskutils/sunbird/files/patch-Makefile.in b/deskutils/sunbird/files/patch-Makefile.in deleted file mode 100644 index b09d564..0000000 --- a/deskutils/sunbird/files/patch-Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.in.orig Thu Oct 21 19:25:55 2004 -+++ Makefile.in Thu Oct 21 19:26:46 2004 -@@ -80,8 +80,7 @@ - $(tier_1_dirs) \ - $(tier_2_dirs) \ - $(tier_9_dirs) \ -- $(tier_50_dirs) \ -- $(NULL) -+ $(tier_50_dirs) - - ifdef GC_LEAK_DETECTOR - DIRS += gc/boehm -@@ -100,7 +99,8 @@ - DIRS += $(tier_98_dirs) - endif - --DIRS += $(tier_99_dirs) -+DIRS += $(tier_99_dirs) \ -+ $(NULL) - - # - # tier 0 - base build config dirs diff --git a/deskutils/sunbird/files/patch-config_rules.mk b/deskutils/sunbird/files/patch-config_rules.mk index 16cb6ae..7377726 100644 --- a/deskutils/sunbird/files/patch-config_rules.mk +++ b/deskutils/sunbird/files/patch-config_rules.mk @@ -1,14 +1,11 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ +--- config/rules.mk.orig Fri Jul 7 00:13:36 2006 ++++ config/rules.mk Sun Sep 3 00:04:03 2006 +@@ -443,7 +443,7 @@ ifeq ($(OS_ARCH),FreeBSD) ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) +-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif endif endif diff --git a/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h b/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h new file mode 100644 index 0000000..534bccb --- /dev/null +++ b/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h @@ -0,0 +1,20 @@ +--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006 ++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006 +@@ -41,7 +41,7 @@ + #define __txdouble_h__ + + //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ ++/* #ifdef __FreeBSD__ + #include <ieeefp.h> + #ifdef __alpha__ + fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +@@ -50,7 +50,7 @@ + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif +- ++*/ + /** + * Macros to workaround math-bugs bugs in various platforms + */ diff --git a/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp b/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp deleted file mode 100644 index 6795f92..0000000 --- a/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- content/xslt/src/base/txDouble.cpp.orig Mon Feb 6 15:40:52 2006 -+++ content/xslt/src/base/txDouble.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/deskutils/sunbird/files/patch-libm b/deskutils/sunbird/files/patch-libm deleted file mode 100644 index 7de64b2..0000000 --- a/deskutils/sunbird/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/deskutils/sunbird/files/patch-nothreads-sqlite b/deskutils/sunbird/files/patch-nothreads-sqlite new file mode 100644 index 0000000..1b1bbbc --- /dev/null +++ b/deskutils/sunbird/files/patch-nothreads-sqlite @@ -0,0 +1,12 @@ +--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 ++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 +@@ -99,7 +99,8 @@ + # REFEF_IO allows us to override IO functions, which is used in the AsyncIO + # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we + # don't have to vacuum to make sure the data is not visible in the file. +-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 ++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 ++# -DTHREADSAFE=1 + + ifdef ENABLE_TESTS + ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) diff --git a/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss index a9154ce..f1397eb 100644 --- a/deskutils/sunbird/files/patch-sysnss +++ b/deskutils/sunbird/files/patch-sysnss @@ -1,103 +1,55 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) +--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 ++++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 +@@ -124,19 +124,19 @@ + pipboot \ + $(NULL) ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif +-EXTRA_DEPS = $(NSS_DEP_LIBS) --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = + DEFINES += -DNSS_ENABLE_ECC - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += $(NSS_CFLAGS) ++LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } + EXTRA_DSO_LDOPTS += \ + $(MOZ_UNICHARUTIL_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NSS_LIBS) \ ++ $(LOCAL_INCLUDES) \ + $(NULL) -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); ---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 -+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 -@@ -52,18 +52,9 @@ + include $(topsrcdir)/config/rules.mk +--- security/manager/Makefile.in.orig Thu Jun 22 14:47:38 2006 ++++ security/manager/Makefile.in Thu Oct 12 23:54:37 2006 +@@ -54,22 +54,13 @@ SSL3_LIB \ SOFTOKEN3_LIB \ SOFTOKEN3_CHK \ - LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ + HAVE_FREEBL_LIBS \ + HAVE_FREEBL_LIBS_32 \ + HAVE_FREEBL_LIBS_32INT64 \ + HAVE_FREEBL_LIBS_64 \ $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) + endif + -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk - - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) - ifndef HAVE_64BIT_OS -@@ -151,11 +142,6 @@ + # Default + HAVE_FREEBL_LIBS = 1 +@@ -217,11 +208,6 @@ .nss.cleaned: .nss.checkout + ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK @@ -105,26 +57,66 @@ - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif touch $@ - - .nss.checkout: -@@ -176,10 +162,10 @@ - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) endif + +@@ -242,95 +228,16 @@ + + libs:: + ifndef MOZ_NATIVE_NSS +- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK +-ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - ifndef SKIP_CHK -@@ -203,20 +189,6 @@ +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin +-ifdef HAVE_FREEBL_LIBS +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_32 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_32INT64 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin +-endif +-ifdef HAVE_FREEBL_LIBS_64 +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin +-endif +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + $(MAKE) -C locales $@ + ifdef MOZ_XUL + $(MAKE) -C pki $@ endif ++endif install:: + ifndef MOZ_NATIVE_NSS - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) -ifndef SKIP_CHK - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) @@ -133,24 +125,47 @@ - $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +-ifdef HAVE_FREEBL_LIBS +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_32 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_32INT64 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) +-endif +-ifdef HAVE_FREEBL_LIBS_64 +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) -endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) +-endif + endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -232,11 +204,6 @@ +@@ -347,12 +254,6 @@ $(MAKE) -C pki $@ endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean + ifndef MOZ_NATIVE_NSS +- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif + endif echo-requires-recursive:: - $(MAKE) -C boot $@ diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile index 958221f..867ecf7 100644 --- a/deskutils/timer-applet/Makefile +++ b/deskutils/timer-applet/Makefile @@ -7,6 +7,7 @@ PORTNAME= timer-applet PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= timerapplet @@ -15,12 +16,12 @@ MAINTAINER= jylefort@FreeBSD.org COMMENT= A timer applet for the GNOME panel LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio +RUN_DEPENDS= ${LOCALBASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes GCONF_SCHEMAS= timer-applet.schemas INSTALLS_OMF= yes @@ -30,7 +31,7 @@ post-patch: 's|/usr/share/pixmaps/|${PREFIX}/share/gnome/pixmaps/|' \ ${WRKSRC}/GNOME_TimerApplet.server.in.in @${REINPLACE_CMD} -e \ - 's|$$(datadir)/sounds|${X11BASE}/share/gnome/sounds|' \ + 's|$$(datadir)/sounds|${LOCALBASE}/share/gnome/sounds|' \ ${WRKSRC}/src/Makefile.in .include <bsd.port.mk> diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist index 1359518..04ec9a5 100644 --- a/deskutils/timer-applet/pkg-plist +++ b/deskutils/timer-applet/pkg-plist @@ -24,3 +24,9 @@ share/locale/tr/LC_MESSAGES/timer-applet.mo @dirrm share/gnome/help/timer-applet @dirrm share/gnome/omf/timer-applet @dirrm share/gnome/pixmaps/timer-applet +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile index b7b25df..f20b7ed 100644 --- a/deskutils/xfce4-calendar/Makefile +++ b/deskutils/xfce4-calendar/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-calendar PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \ http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \ @@ -25,7 +25,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \ dbh-1.0.1:${PORTSDIR}/databases/dbh USE_GNOME= gtk20 libxml2 -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \ diff --git a/deskutils/xfce4-calendar/pkg-plist b/deskutils/xfce4-calendar/pkg-plist index b469b8a..c82b525 100644 --- a/deskutils/xfce4-calendar/pkg-plist +++ b/deskutils/xfce4-calendar/pkg-plist @@ -55,3 +55,39 @@ share/locale/vi/LC_MESSAGES/xfcalendar.mo share/locale/zh_CN/LC_MESSAGES/xfcalendar.mo share/locale/zh_TW/LC_MESSAGES/xfcalendar.mo @dirrmtry lib/xfce4/mcs-plugins +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile index 8a16d37..1be7b2a 100644 --- a/deskutils/xfce4-notes-plugin/Makefile +++ b/deskutils/xfce4-notes-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-notes-plugin PORTVERSION= 0.9.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils xfce MASTER_SITES= http://download.berlios.de/xfce-goodies/ DIST_SUBDIR= xfce4 @@ -21,7 +21,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel USE_GNOME= gtk20 libxml2 -USE_X_PREFIX= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile index bb9a09d..6bb37b5 100644 --- a/deskutils/xfce4-taskbar-plugin/Makefile +++ b/deskutils/xfce4-taskbar-plugin/Makefile @@ -3,11 +3,11 @@ # Whom: Matt Lancereau <matt@rimasec.net> # # $FreeBSD$ -# +# $MCom: ports/deskutils/xfce4-taskbar-plugin/Makefile,v 1.1 2006/10/02 20:05:39 ahze Exp $ PORTNAME= xfce4-taskbar-plugin PORTVERSION= 0.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils xfce MASTER_SITES= http://download.berlios.de/xfce-goodies/ DISTNAME= xfce4-taskbar-plugin-${PORTVERSION} @@ -23,7 +23,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel USE_GNOME= gtk20 libxml2 -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile index 9be8a95..a254b55 100644 --- a/deskutils/xfce4-windowlist-plugin/Makefile +++ b/deskutils/xfce4-windowlist-plugin/Makefile @@ -3,11 +3,11 @@ # Whom: Matt Lancereau <matt@rimasec.net> # # $FreeBSD$ -# +# $MCom: ports/deskutils/xfce4-windowlist-plugin/Makefile,v 1.1 2006/10/02 20:06:45 ahze Exp $ PORTNAME= xfce4-windowlist-plugin PORTVERSION= 0.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils xfce MASTER_SITES= http://download.berlios.de/xfce-goodies/ DISTNAME= xfce4-windowlist-plugin-${PORTVERSION} @@ -23,7 +23,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel USE_GNOME= gtk20 libxml2 -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile index 768c948..1abc185 100644 --- a/deskutils/xfce4-xkb-plugin/Makefile +++ b/deskutils/xfce4-xkb-plugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfce4-xkb-plugin PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= http://download.berlios.de/xfce-goodies/ DIST_SUBDIR= xfce4 @@ -20,7 +21,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel USE_GNOME= gtk20 libxml2 -USE_X_PREFIX= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile index 7635c78..7432be9 100644 --- a/deskutils/xpad/Makefile +++ b/deskutils/xpad/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpad PORTVERSION= 2.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,8 +16,8 @@ MAINTAINER= amyfoub@gmail.com COMMENT= A virtual note-pad system for your X11 desktop USE_BZIP2= yes -USE_GNOME= pkgconfig gtk20 gnomehack intltool -USE_X_PREFIX= yes +USE_GNOME= pkgconfig gtk20 gnomehier intltool +USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist index 740bda4..8a91263 100644 --- a/deskutils/xpad/pkg-plist +++ b/deskutils/xpad/pkg-plist @@ -22,6 +22,17 @@ share/locale/vi/LC_MESSAGES/xpad.mo share/locale/zh_CN/LC_MESSAGES/xpad.mo share/locale/zh_TW/LC_MESSAGES/xpad.mo share/pixmaps/xpad.png +@dirrmtry share/pixmaps @dirrmtry share/applications +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro |
