diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 7536b5c16ff4..f4a92a5701df 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,64 +1,71 @@ # Ports collection Makefile for: galeon # Date created: 1 August 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= galeon -PORTVERSION= 0.10.6 -PORTREVISION= 1 +PORTVERSION= 0.11.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ${MASTER_SITE_LOCAL:S/%SUBDIR%/sobomax/} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/pre/} MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ - ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} + ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \ + msgfmt-new:${PORTS}/devel/gettext-devel +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -BROKEN= "b0rken with Mozilla-0.9.1" +#BROKEN= "b0rken with Mozilla-0.9.1" .if !defined(WITH_FULL_MOZILLA) MOZILLA= mozilla-embedded .else MOZILLA= mozilla .endif USE_X_PREFIX= yes USE_NEWGCC= yes USE_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -D_REENTRANT ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + MSGFMT=${LOCALBASE}/bin/msgfmt-new \ + XGETTEXT=${LOCALBASE}/bin/xgettext-new + +MAN1= galeon.1 post-extract: .if !defined(WITH_FULL_MOZILLA) @${ECHO_MSG} @${ECHO_MSG} " By default the port uses mozilla-embedded for html rendering, but if you are" @${ECHO_MSG} " planning to use both Mozilla and Galeon you can instruct it to use mozilla by" @${ECHO_MSG} " defining \"WITH_FULL_MOZILLA\"." @${ECHO_MSG} .endif pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|-liconv|-lgiconv|g ; s|iconv\.h|giconv.h|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' + @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ + 's|iconv\.h|giconv.h|g' post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g ; \ s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon .include diff --git a/www/galeon/distinfo b/www/galeon/distinfo index 0ea9f11e936e..698469ac6baa 100644 --- a/www/galeon/distinfo +++ b/www/galeon/distinfo @@ -1 +1 @@ -MD5 (galeon-0.10.6.tar.gz) = eda0f7dc904298dcdff09e871825eaf7 +MD5 (galeon-0.11.1.tar.gz) = 0ea44321a7661f95815f77923622d29d diff --git a/www/galeon/files/patch-ab b/www/galeon/files/patch-ab index b13e0b2a87bc..985baef969a1 100644 --- a/www/galeon/files/patch-ab +++ b/www/galeon/files/patch-ab @@ -1,40 +1,56 @@ $FreeBSD$ ---- src/galeon.in 2001/05/15 11:38:39 1.1 -+++ src/galeon.in 2001/05/15 11:42:43 -@@ -1,19 +1,15 @@ +--- src/galeon.in.orig Tue Jul 3 13:30:53 2001 ++++ src/galeon.in Wed Jul 4 18:39:12 2001 +@@ -1,25 +1,15 @@ #!/bin/sh -dist_bin=`dirname $0` - if test -n "$MOZILLA_FIVE_HOME"; then MOZILLA_HOME=$MOZILLA_FIVE_HOME -elif [ -f @MOZILLA_HOME@/chrome/embed.jar ]; then +elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then MOZILLA_HOME=@MOZILLA_HOME@ -elif [ -f /usr/local/mozilla/chrome/embed.jar ]; then - MOZILLA_HOME=/usr/local/mozilla -elif [ -f /usr/lib/mozilla/chrome/embed.jar ]; then - MOZILLA_HOME=/usr/lib/mozilla -elif [ -f /opt/mozilla/chrome/embed.jar ]; then - MOZILLA_HOME=/opt/mozilla -elif [ -f /usr/lib/mozilla-0.8.1/chrome/embed.jar ]; then - MOZILLA_HOME=/usr/lib/mozilla-0.8.1/ +-elif [ -f /usr/lib/mozilla-0.9.1/chrome/embed.jar ]; then +- MOZILLA_HOME=/usr/lib/mozilla-0.9.1/ +-elif [ -f /usr/lib/mozilla-0.9.2/chrome/embed.jar ]; then +- MOZILLA_HOME=/usr/lib/mozilla-0.9.2/ +-elif [ -f /opt/gnome/lib/mozilla/chrome/embed.jar ]; then +- MOZILLA_HOME=/opt/gnome/lib/mozilla/ +elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then + MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%% +elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then + MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% +elif [ -f %%PREFIX%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then + MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%% else echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory" exit -@@ -34,6 +30,6 @@ +@@ -31,16 +21,9 @@ + MOZILLA_FIVE_HOME=$MOZILLA_HOME + export MOZILLA_FIVE_HOME + +-# for some reason this lets Galeon start properly on Red Hat 7.1 systems +-if [ -f /etc/redhat-release ]; then +- if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)" ]; then +- export LD_ASSUME_KERNEL=2.2.5 +- fi +-fi +- if [ -f ./galeon-bin ]; then exec ./galeon-bin "$@" else -exec $dist_bin/galeon-bin "$@" +exec %%PREFIX%%/bin/galeon-bin "$@" fi diff --git a/www/galeon/files/patch-configure b/www/galeon/files/patch-configure new file mode 100644 index 000000000000..7f6c287774f7 --- /dev/null +++ b/www/galeon/files/patch-configure @@ -0,0 +1,20 @@ + +$FreeBSD$ + +--- configure 2001/07/04 17:52:53 1.1 ++++ configure 2001/07/04 17:53:44 +@@ -6043,10 +6043,10 @@ + s%@INSTALL_DATA@%$INSTALL_DATA%g + s%@PACKAGE@%$PACKAGE%g + s%@VERSION@%$VERSION%g +-s%@ACLOCAL@%$ACLOCAL%g +-s%@AUTOCONF@%$AUTOCONF%g +-s%@AUTOMAKE@%$AUTOMAKE%g +-s%@AUTOHEADER@%$AUTOHEADER%g ++s%@ACLOCAL@%/usr/bin/true%g ++s%@AUTOCONF@%/usr/bin/true%g ++s%@AUTOMAKE@%/usr/bin/true%g ++s%@AUTOHEADER@%/usr/bin/true%g + s%@MAKEINFO@%$MAKEINFO%g + s%@SET_MAKE@%$SET_MAKE%g + s%@XML_I18N_MERGE_OAF_RULE@%$XML_I18N_MERGE_OAF_RULE%g diff --git a/www/galeon/files/patch-po::Makefile.in.in b/www/galeon/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..badad97ac354 --- /dev/null +++ b/www/galeon/files/patch-po::Makefile.in.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2001/07/04 17:56:11 1.1 ++++ po/Makefile.in.in 2001/07/04 17:56:34 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist index 5bd4b281509f..d9cb2619bd15 100644 --- a/www/galeon/pkg-plist +++ b/www/galeon/pkg-plist @@ -1,162 +1,196 @@ bin/galeon bin/galeon-bin etc/sound/events/galeon.soundlist share/gnome/apps/Internet/galeon.desktop +share/gnome/galeon/Back.png +share/gnome/galeon/Forward.png +share/gnome/galeon/Go.png +share/gnome/galeon/Home.png +share/gnome/galeon/New.png +share/gnome/galeon/Refresh.png +share/gnome/galeon/Stop.png +share/gnome/galeon/Up.png +share/gnome/galeon/about_logo.png +share/gnome/galeon/bookmarks.glade +share/gnome/galeon/default.xpm +share/gnome/galeon/default_open.xpm share/gnome/galeon/delete.xpm share/gnome/galeon/dir.xpm share/gnome/galeon/dir_open.xpm share/gnome/galeon/drag-url-icon.png share/gnome/galeon/galeon-composite.png share/gnome/galeon/galeon-watermark.png share/gnome/galeon/galeon.glade share/gnome/galeon/galeon.png share/gnome/galeon/google.png share/gnome/galeon/i-bookmark.xpm share/gnome/galeon/link.xpm share/gnome/galeon/logo.png share/gnome/galeon/myportal.css +share/gnome/galeon/new_alias.xpm +share/gnome/galeon/new_alias_small.xpm share/gnome/galeon/new_folder.xpm +share/gnome/galeon/new_folder_small.xpm share/gnome/galeon/new_item.xpm +share/gnome/galeon/new_item_small.xpm share/gnome/galeon/new_separator.xpm +share/gnome/galeon/new_separator_small.xpm +share/gnome/galeon/preferences.glade +share/gnome/galeon/prompts.glade share/gnome/galeon/small-close.xpm share/gnome/galeon/small-detach.xpm share/gnome/galeon/spinners/crux/001.png share/gnome/galeon/spinners/crux/002.png share/gnome/galeon/spinners/crux/003.png share/gnome/galeon/spinners/crux/004.png share/gnome/galeon/spinners/crux/005.png share/gnome/galeon/spinners/crux/006.png share/gnome/galeon/spinners/crux/007.png share/gnome/galeon/spinners/crux/008.png share/gnome/galeon/spinners/crux/009.png share/gnome/galeon/spinners/crux/010.png share/gnome/galeon/spinners/crux/011.png share/gnome/galeon/spinners/crux/012.png share/gnome/galeon/spinners/crux/013.png share/gnome/galeon/spinners/crux/014.png share/gnome/galeon/spinners/crux/015.png share/gnome/galeon/spinners/crux/016.png share/gnome/galeon/spinners/crux/017.png share/gnome/galeon/spinners/crux/018.png share/gnome/galeon/spinners/crux/019.png share/gnome/galeon/spinners/crux/020.png share/gnome/galeon/spinners/crux/021.png share/gnome/galeon/spinners/crux/022.png share/gnome/galeon/spinners/crux/023.png share/gnome/galeon/spinners/crux/024.png share/gnome/galeon/spinners/crux/025.png share/gnome/galeon/spinners/crux/026.png share/gnome/galeon/spinners/crux/027.png share/gnome/galeon/spinners/crux/028.png share/gnome/galeon/spinners/crux/029.png share/gnome/galeon/spinners/crux/030.png share/gnome/galeon/spinners/crux/rest.png share/gnome/galeon/spinners/pacspin/001.png share/gnome/galeon/spinners/pacspin/002.png share/gnome/galeon/spinners/pacspin/003.png share/gnome/galeon/spinners/pacspin/004.png share/gnome/galeon/spinners/pacspin/005.png share/gnome/galeon/spinners/pacspin/006.png share/gnome/galeon/spinners/pacspin/007.png share/gnome/galeon/spinners/pacspin/008.png share/gnome/galeon/spinners/pacspin/009.png share/gnome/galeon/spinners/pacspin/010.png share/gnome/galeon/spinners/pacspin/011.png share/gnome/galeon/spinners/pacspin/012.png share/gnome/galeon/spinners/pacspin/013.png share/gnome/galeon/spinners/pacspin/014.png share/gnome/galeon/spinners/pacspin/015.png share/gnome/galeon/spinners/pacspin/016.png share/gnome/galeon/spinners/pacspin/017.png share/gnome/galeon/spinners/pacspin/018.png share/gnome/galeon/spinners/pacspin/019.png share/gnome/galeon/spinners/pacspin/020.png share/gnome/galeon/spinners/pacspin/021.png share/gnome/galeon/spinners/pacspin/022.png share/gnome/galeon/spinners/pacspin/023.png share/gnome/galeon/spinners/pacspin/024.png share/gnome/galeon/spinners/pacspin/025.png share/gnome/galeon/spinners/pacspin/026.png share/gnome/galeon/spinners/pacspin/027.png share/gnome/galeon/spinners/pacspin/028.png share/gnome/galeon/spinners/pacspin/029.png share/gnome/galeon/spinners/pacspin/030.png share/gnome/galeon/spinners/pacspin/031.png share/gnome/galeon/spinners/pacspin/rest.png share/gnome/galeon/spinners/pipeon/001.png share/gnome/galeon/spinners/pipeon/002.png share/gnome/galeon/spinners/pipeon/003.png share/gnome/galeon/spinners/pipeon/004.png share/gnome/galeon/spinners/pipeon/005.png share/gnome/galeon/spinners/pipeon/006.png share/gnome/galeon/spinners/pipeon/007.png share/gnome/galeon/spinners/pipeon/008.png share/gnome/galeon/spinners/pipeon/009.png share/gnome/galeon/spinners/pipeon/010.png share/gnome/galeon/spinners/pipeon/011.png share/gnome/galeon/spinners/pipeon/012.png share/gnome/galeon/spinners/pipeon/013.png share/gnome/galeon/spinners/pipeon/014.png share/gnome/galeon/spinners/pipeon/rest.png share/gnome/help/galeon/C/aboutbook.html +share/gnome/help/galeon/C/authors.html +share/gnome/help/galeon/C/bookmarks-aliases.html +share/gnome/help/galeon/C/bookmarks-context-menus.html +share/gnome/help/galeon/C/bookmarks-importing.html +share/gnome/help/galeon/C/bookmarks-my-portal.html +share/gnome/help/galeon/C/bookmarks-nicks.html +share/gnome/help/galeon/C/bookmarks-smart-bookmarks.html +share/gnome/help/galeon/C/bookmarks-temporary-bookmarks.html +share/gnome/help/galeon/C/bookmarks-toolbars.html +share/gnome/help/galeon/C/bookmarks-with-images.html +share/gnome/help/galeon/C/bookmarks.html share/gnome/help/galeon/C/browser-window.html -share/gnome/help/galeon/C/docbook.css +share/gnome/help/galeon/C/bugs.html +share/gnome/help/galeon/C/command-line-options.html +share/gnome/help/galeon/C/compiling-from-source.html +share/gnome/help/galeon/C/context-menus.html +share/gnome/help/galeon/C/cookie-manager.html +share/gnome/help/galeon/C/cookieman-images.html +share/gnome/help/galeon/C/cookieman-sites.html +share/gnome/help/galeon/C/full-screen-mode.html share/gnome/help/galeon/C/getting-started.html share/gnome/help/galeon/C/index.html share/gnome/help/galeon/C/introduction.html share/gnome/help/galeon/C/ln23.html -share/gnome/help/galeon/C/stylesheet-images/caution.gif -share/gnome/help/galeon/C/stylesheet-images/home.gif -share/gnome/help/galeon/C/stylesheet-images/important.gif -share/gnome/help/galeon/C/stylesheet-images/next.gif -share/gnome/help/galeon/C/stylesheet-images/note.gif -share/gnome/help/galeon/C/stylesheet-images/prev.gif -share/gnome/help/galeon/C/stylesheet-images/tip.gif -share/gnome/help/galeon/C/stylesheet-images/toc-blank.gif -share/gnome/help/galeon/C/stylesheet-images/toc-minus.gif -share/gnome/help/galeon/C/stylesheet-images/toc-plus.gif -share/gnome/help/galeon/C/stylesheet-images/up.gif -share/gnome/help/galeon/C/stylesheet-images/warning.gif +share/gnome/help/galeon/C/preferences.html +share/gnome/help/galeon/C/prefs-advanced.html +share/gnome/help/galeon/C/prefs-gnome-url-handlers.html +share/gnome/help/galeon/C/prefs-handlers.html +share/gnome/help/galeon/C/prefs-rendering.html +share/gnome/help/galeon/C/prefs-user-interface.html +share/gnome/help/galeon/C/statusbar.html +share/gnome/help/galeon/C/toolbar.html share/gnome/oaf/galeon.oaf share/gnome/pixmaps/galeon.png share/gnome/sounds/galeon/clicked.wav share/locale/az/LC_MESSAGES/galeon.mo share/locale/ca/LC_MESSAGES/galeon.mo share/locale/cs/LC_MESSAGES/galeon.mo share/locale/da/LC_MESSAGES/galeon.mo share/locale/de/LC_MESSAGES/galeon.mo share/locale/es/LC_MESSAGES/galeon.mo share/locale/et/LC_MESSAGES/galeon.mo share/locale/fi/LC_MESSAGES/galeon.mo share/locale/fr/LC_MESSAGES/galeon.mo share/locale/gl/LC_MESSAGES/galeon.mo share/locale/hr/LC_MESSAGES/galeon.mo share/locale/hu/LC_MESSAGES/galeon.mo share/locale/it/LC_MESSAGES/galeon.mo share/locale/ja/LC_MESSAGES/galeon.mo share/locale/ko/LC_MESSAGES/galeon.mo share/locale/lt/LC_MESSAGES/galeon.mo share/locale/ms/LC_MESSAGES/galeon.mo share/locale/nl/LC_MESSAGES/galeon.mo share/locale/no/LC_MESSAGES/galeon.mo share/locale/pl/LC_MESSAGES/galeon.mo share/locale/pt_BR/LC_MESSAGES/galeon.mo share/locale/ro/LC_MESSAGES/galeon.mo share/locale/ru/LC_MESSAGES/galeon.mo share/locale/sk/LC_MESSAGES/galeon.mo share/locale/sl/LC_MESSAGES/galeon.mo share/locale/sv/LC_MESSAGES/galeon.mo share/locale/tr/LC_MESSAGES/galeon.mo share/locale/uk/LC_MESSAGES/galeon.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/galeon.mo share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo +@exec mkdir -p %D/share/gnome/help/galeon/C/fig @dirrm share/gnome/sounds/galeon @dirrm share/gnome/help/galeon/C/stylesheet-images -@exec mkdir -p %D/share/gnome/help/galeon/C/fig @dirrm share/gnome/help/galeon/C/fig @dirrm share/gnome/help/galeon/C @dirrm share/gnome/help/galeon @dirrm share/gnome/galeon/spinners/pipeon @dirrm share/gnome/galeon/spinners/pacspin @dirrm share/gnome/galeon/spinners/crux @dirrm share/gnome/galeon/spinners @dirrm share/gnome/galeon diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 7536b5c16ff4..f4a92a5701df 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -1,64 +1,71 @@ # Ports collection Makefile for: galeon # Date created: 1 August 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= galeon -PORTVERSION= 0.10.6 -PORTREVISION= 1 +PORTVERSION= 0.11.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ${MASTER_SITE_LOCAL:S/%SUBDIR%/sobomax/} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/pre/} MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ - ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} + ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \ + msgfmt-new:${PORTS}/devel/gettext-devel +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -BROKEN= "b0rken with Mozilla-0.9.1" +#BROKEN= "b0rken with Mozilla-0.9.1" .if !defined(WITH_FULL_MOZILLA) MOZILLA= mozilla-embedded .else MOZILLA= mozilla .endif USE_X_PREFIX= yes USE_NEWGCC= yes USE_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -D_REENTRANT ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + MSGFMT=${LOCALBASE}/bin/msgfmt-new \ + XGETTEXT=${LOCALBASE}/bin/xgettext-new + +MAN1= galeon.1 post-extract: .if !defined(WITH_FULL_MOZILLA) @${ECHO_MSG} @${ECHO_MSG} " By default the port uses mozilla-embedded for html rendering, but if you are" @${ECHO_MSG} " planning to use both Mozilla and Galeon you can instruct it to use mozilla by" @${ECHO_MSG} " defining \"WITH_FULL_MOZILLA\"." @${ECHO_MSG} .endif pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|-liconv|-lgiconv|g ; s|iconv\.h|giconv.h|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' + @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ + 's|iconv\.h|giconv.h|g' post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g ; \ s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon .include diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo index 0ea9f11e936e..698469ac6baa 100644 --- a/www/galeon2/distinfo +++ b/www/galeon2/distinfo @@ -1 +1 @@ -MD5 (galeon-0.10.6.tar.gz) = eda0f7dc904298dcdff09e871825eaf7 +MD5 (galeon-0.11.1.tar.gz) = 0ea44321a7661f95815f77923622d29d diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab index b13e0b2a87bc..985baef969a1 100644 --- a/www/galeon2/files/patch-ab +++ b/www/galeon2/files/patch-ab @@ -1,40 +1,56 @@ $FreeBSD$ ---- src/galeon.in 2001/05/15 11:38:39 1.1 -+++ src/galeon.in 2001/05/15 11:42:43 -@@ -1,19 +1,15 @@ +--- src/galeon.in.orig Tue Jul 3 13:30:53 2001 ++++ src/galeon.in Wed Jul 4 18:39:12 2001 +@@ -1,25 +1,15 @@ #!/bin/sh -dist_bin=`dirname $0` - if test -n "$MOZILLA_FIVE_HOME"; then MOZILLA_HOME=$MOZILLA_FIVE_HOME -elif [ -f @MOZILLA_HOME@/chrome/embed.jar ]; then +elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then MOZILLA_HOME=@MOZILLA_HOME@ -elif [ -f /usr/local/mozilla/chrome/embed.jar ]; then - MOZILLA_HOME=/usr/local/mozilla -elif [ -f /usr/lib/mozilla/chrome/embed.jar ]; then - MOZILLA_HOME=/usr/lib/mozilla -elif [ -f /opt/mozilla/chrome/embed.jar ]; then - MOZILLA_HOME=/opt/mozilla -elif [ -f /usr/lib/mozilla-0.8.1/chrome/embed.jar ]; then - MOZILLA_HOME=/usr/lib/mozilla-0.8.1/ +-elif [ -f /usr/lib/mozilla-0.9.1/chrome/embed.jar ]; then +- MOZILLA_HOME=/usr/lib/mozilla-0.9.1/ +-elif [ -f /usr/lib/mozilla-0.9.2/chrome/embed.jar ]; then +- MOZILLA_HOME=/usr/lib/mozilla-0.9.2/ +-elif [ -f /opt/gnome/lib/mozilla/chrome/embed.jar ]; then +- MOZILLA_HOME=/opt/gnome/lib/mozilla/ +elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then + MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%% +elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then + MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% +elif [ -f %%PREFIX%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then + MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%% else echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory" exit -@@ -34,6 +30,6 @@ +@@ -31,16 +21,9 @@ + MOZILLA_FIVE_HOME=$MOZILLA_HOME + export MOZILLA_FIVE_HOME + +-# for some reason this lets Galeon start properly on Red Hat 7.1 systems +-if [ -f /etc/redhat-release ]; then +- if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)" ]; then +- export LD_ASSUME_KERNEL=2.2.5 +- fi +-fi +- if [ -f ./galeon-bin ]; then exec ./galeon-bin "$@" else -exec $dist_bin/galeon-bin "$@" +exec %%PREFIX%%/bin/galeon-bin "$@" fi diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure new file mode 100644 index 000000000000..7f6c287774f7 --- /dev/null +++ b/www/galeon2/files/patch-configure @@ -0,0 +1,20 @@ + +$FreeBSD$ + +--- configure 2001/07/04 17:52:53 1.1 ++++ configure 2001/07/04 17:53:44 +@@ -6043,10 +6043,10 @@ + s%@INSTALL_DATA@%$INSTALL_DATA%g + s%@PACKAGE@%$PACKAGE%g + s%@VERSION@%$VERSION%g +-s%@ACLOCAL@%$ACLOCAL%g +-s%@AUTOCONF@%$AUTOCONF%g +-s%@AUTOMAKE@%$AUTOMAKE%g +-s%@AUTOHEADER@%$AUTOHEADER%g ++s%@ACLOCAL@%/usr/bin/true%g ++s%@AUTOCONF@%/usr/bin/true%g ++s%@AUTOMAKE@%/usr/bin/true%g ++s%@AUTOHEADER@%/usr/bin/true%g + s%@MAKEINFO@%$MAKEINFO%g + s%@SET_MAKE@%$SET_MAKE%g + s%@XML_I18N_MERGE_OAF_RULE@%$XML_I18N_MERGE_OAF_RULE%g diff --git a/www/galeon2/files/patch-po::Makefile.in.in b/www/galeon2/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..badad97ac354 --- /dev/null +++ b/www/galeon2/files/patch-po::Makefile.in.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2001/07/04 17:56:11 1.1 ++++ po/Makefile.in.in 2001/07/04 17:56:34 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist index 5bd4b281509f..d9cb2619bd15 100644 --- a/www/galeon2/pkg-plist +++ b/www/galeon2/pkg-plist @@ -1,162 +1,196 @@ bin/galeon bin/galeon-bin etc/sound/events/galeon.soundlist share/gnome/apps/Internet/galeon.desktop +share/gnome/galeon/Back.png +share/gnome/galeon/Forward.png +share/gnome/galeon/Go.png +share/gnome/galeon/Home.png +share/gnome/galeon/New.png +share/gnome/galeon/Refresh.png +share/gnome/galeon/Stop.png +share/gnome/galeon/Up.png +share/gnome/galeon/about_logo.png +share/gnome/galeon/bookmarks.glade +share/gnome/galeon/default.xpm +share/gnome/galeon/default_open.xpm share/gnome/galeon/delete.xpm share/gnome/galeon/dir.xpm share/gnome/galeon/dir_open.xpm share/gnome/galeon/drag-url-icon.png share/gnome/galeon/galeon-composite.png share/gnome/galeon/galeon-watermark.png share/gnome/galeon/galeon.glade share/gnome/galeon/galeon.png share/gnome/galeon/google.png share/gnome/galeon/i-bookmark.xpm share/gnome/galeon/link.xpm share/gnome/galeon/logo.png share/gnome/galeon/myportal.css +share/gnome/galeon/new_alias.xpm +share/gnome/galeon/new_alias_small.xpm share/gnome/galeon/new_folder.xpm +share/gnome/galeon/new_folder_small.xpm share/gnome/galeon/new_item.xpm +share/gnome/galeon/new_item_small.xpm share/gnome/galeon/new_separator.xpm +share/gnome/galeon/new_separator_small.xpm +share/gnome/galeon/preferences.glade +share/gnome/galeon/prompts.glade share/gnome/galeon/small-close.xpm share/gnome/galeon/small-detach.xpm share/gnome/galeon/spinners/crux/001.png share/gnome/galeon/spinners/crux/002.png share/gnome/galeon/spinners/crux/003.png share/gnome/galeon/spinners/crux/004.png share/gnome/galeon/spinners/crux/005.png share/gnome/galeon/spinners/crux/006.png share/gnome/galeon/spinners/crux/007.png share/gnome/galeon/spinners/crux/008.png share/gnome/galeon/spinners/crux/009.png share/gnome/galeon/spinners/crux/010.png share/gnome/galeon/spinners/crux/011.png share/gnome/galeon/spinners/crux/012.png share/gnome/galeon/spinners/crux/013.png share/gnome/galeon/spinners/crux/014.png share/gnome/galeon/spinners/crux/015.png share/gnome/galeon/spinners/crux/016.png share/gnome/galeon/spinners/crux/017.png share/gnome/galeon/spinners/crux/018.png share/gnome/galeon/spinners/crux/019.png share/gnome/galeon/spinners/crux/020.png share/gnome/galeon/spinners/crux/021.png share/gnome/galeon/spinners/crux/022.png share/gnome/galeon/spinners/crux/023.png share/gnome/galeon/spinners/crux/024.png share/gnome/galeon/spinners/crux/025.png share/gnome/galeon/spinners/crux/026.png share/gnome/galeon/spinners/crux/027.png share/gnome/galeon/spinners/crux/028.png share/gnome/galeon/spinners/crux/029.png share/gnome/galeon/spinners/crux/030.png share/gnome/galeon/spinners/crux/rest.png share/gnome/galeon/spinners/pacspin/001.png share/gnome/galeon/spinners/pacspin/002.png share/gnome/galeon/spinners/pacspin/003.png share/gnome/galeon/spinners/pacspin/004.png share/gnome/galeon/spinners/pacspin/005.png share/gnome/galeon/spinners/pacspin/006.png share/gnome/galeon/spinners/pacspin/007.png share/gnome/galeon/spinners/pacspin/008.png share/gnome/galeon/spinners/pacspin/009.png share/gnome/galeon/spinners/pacspin/010.png share/gnome/galeon/spinners/pacspin/011.png share/gnome/galeon/spinners/pacspin/012.png share/gnome/galeon/spinners/pacspin/013.png share/gnome/galeon/spinners/pacspin/014.png share/gnome/galeon/spinners/pacspin/015.png share/gnome/galeon/spinners/pacspin/016.png share/gnome/galeon/spinners/pacspin/017.png share/gnome/galeon/spinners/pacspin/018.png share/gnome/galeon/spinners/pacspin/019.png share/gnome/galeon/spinners/pacspin/020.png share/gnome/galeon/spinners/pacspin/021.png share/gnome/galeon/spinners/pacspin/022.png share/gnome/galeon/spinners/pacspin/023.png share/gnome/galeon/spinners/pacspin/024.png share/gnome/galeon/spinners/pacspin/025.png share/gnome/galeon/spinners/pacspin/026.png share/gnome/galeon/spinners/pacspin/027.png share/gnome/galeon/spinners/pacspin/028.png share/gnome/galeon/spinners/pacspin/029.png share/gnome/galeon/spinners/pacspin/030.png share/gnome/galeon/spinners/pacspin/031.png share/gnome/galeon/spinners/pacspin/rest.png share/gnome/galeon/spinners/pipeon/001.png share/gnome/galeon/spinners/pipeon/002.png share/gnome/galeon/spinners/pipeon/003.png share/gnome/galeon/spinners/pipeon/004.png share/gnome/galeon/spinners/pipeon/005.png share/gnome/galeon/spinners/pipeon/006.png share/gnome/galeon/spinners/pipeon/007.png share/gnome/galeon/spinners/pipeon/008.png share/gnome/galeon/spinners/pipeon/009.png share/gnome/galeon/spinners/pipeon/010.png share/gnome/galeon/spinners/pipeon/011.png share/gnome/galeon/spinners/pipeon/012.png share/gnome/galeon/spinners/pipeon/013.png share/gnome/galeon/spinners/pipeon/014.png share/gnome/galeon/spinners/pipeon/rest.png share/gnome/help/galeon/C/aboutbook.html +share/gnome/help/galeon/C/authors.html +share/gnome/help/galeon/C/bookmarks-aliases.html +share/gnome/help/galeon/C/bookmarks-context-menus.html +share/gnome/help/galeon/C/bookmarks-importing.html +share/gnome/help/galeon/C/bookmarks-my-portal.html +share/gnome/help/galeon/C/bookmarks-nicks.html +share/gnome/help/galeon/C/bookmarks-smart-bookmarks.html +share/gnome/help/galeon/C/bookmarks-temporary-bookmarks.html +share/gnome/help/galeon/C/bookmarks-toolbars.html +share/gnome/help/galeon/C/bookmarks-with-images.html +share/gnome/help/galeon/C/bookmarks.html share/gnome/help/galeon/C/browser-window.html -share/gnome/help/galeon/C/docbook.css +share/gnome/help/galeon/C/bugs.html +share/gnome/help/galeon/C/command-line-options.html +share/gnome/help/galeon/C/compiling-from-source.html +share/gnome/help/galeon/C/context-menus.html +share/gnome/help/galeon/C/cookie-manager.html +share/gnome/help/galeon/C/cookieman-images.html +share/gnome/help/galeon/C/cookieman-sites.html +share/gnome/help/galeon/C/full-screen-mode.html share/gnome/help/galeon/C/getting-started.html share/gnome/help/galeon/C/index.html share/gnome/help/galeon/C/introduction.html share/gnome/help/galeon/C/ln23.html -share/gnome/help/galeon/C/stylesheet-images/caution.gif -share/gnome/help/galeon/C/stylesheet-images/home.gif -share/gnome/help/galeon/C/stylesheet-images/important.gif -share/gnome/help/galeon/C/stylesheet-images/next.gif -share/gnome/help/galeon/C/stylesheet-images/note.gif -share/gnome/help/galeon/C/stylesheet-images/prev.gif -share/gnome/help/galeon/C/stylesheet-images/tip.gif -share/gnome/help/galeon/C/stylesheet-images/toc-blank.gif -share/gnome/help/galeon/C/stylesheet-images/toc-minus.gif -share/gnome/help/galeon/C/stylesheet-images/toc-plus.gif -share/gnome/help/galeon/C/stylesheet-images/up.gif -share/gnome/help/galeon/C/stylesheet-images/warning.gif +share/gnome/help/galeon/C/preferences.html +share/gnome/help/galeon/C/prefs-advanced.html +share/gnome/help/galeon/C/prefs-gnome-url-handlers.html +share/gnome/help/galeon/C/prefs-handlers.html +share/gnome/help/galeon/C/prefs-rendering.html +share/gnome/help/galeon/C/prefs-user-interface.html +share/gnome/help/galeon/C/statusbar.html +share/gnome/help/galeon/C/toolbar.html share/gnome/oaf/galeon.oaf share/gnome/pixmaps/galeon.png share/gnome/sounds/galeon/clicked.wav share/locale/az/LC_MESSAGES/galeon.mo share/locale/ca/LC_MESSAGES/galeon.mo share/locale/cs/LC_MESSAGES/galeon.mo share/locale/da/LC_MESSAGES/galeon.mo share/locale/de/LC_MESSAGES/galeon.mo share/locale/es/LC_MESSAGES/galeon.mo share/locale/et/LC_MESSAGES/galeon.mo share/locale/fi/LC_MESSAGES/galeon.mo share/locale/fr/LC_MESSAGES/galeon.mo share/locale/gl/LC_MESSAGES/galeon.mo share/locale/hr/LC_MESSAGES/galeon.mo share/locale/hu/LC_MESSAGES/galeon.mo share/locale/it/LC_MESSAGES/galeon.mo share/locale/ja/LC_MESSAGES/galeon.mo share/locale/ko/LC_MESSAGES/galeon.mo share/locale/lt/LC_MESSAGES/galeon.mo share/locale/ms/LC_MESSAGES/galeon.mo share/locale/nl/LC_MESSAGES/galeon.mo share/locale/no/LC_MESSAGES/galeon.mo share/locale/pl/LC_MESSAGES/galeon.mo share/locale/pt_BR/LC_MESSAGES/galeon.mo share/locale/ro/LC_MESSAGES/galeon.mo share/locale/ru/LC_MESSAGES/galeon.mo share/locale/sk/LC_MESSAGES/galeon.mo share/locale/sl/LC_MESSAGES/galeon.mo share/locale/sv/LC_MESSAGES/galeon.mo share/locale/tr/LC_MESSAGES/galeon.mo share/locale/uk/LC_MESSAGES/galeon.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/galeon.mo share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo +@exec mkdir -p %D/share/gnome/help/galeon/C/fig @dirrm share/gnome/sounds/galeon @dirrm share/gnome/help/galeon/C/stylesheet-images -@exec mkdir -p %D/share/gnome/help/galeon/C/fig @dirrm share/gnome/help/galeon/C/fig @dirrm share/gnome/help/galeon/C @dirrm share/gnome/help/galeon @dirrm share/gnome/galeon/spinners/pipeon @dirrm share/gnome/galeon/spinners/pacspin @dirrm share/gnome/galeon/spinners/crux @dirrm share/gnome/galeon/spinners @dirrm share/gnome/galeon