diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-21 16:52:10 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-21 16:52:10 +0000 |
commit | 531f45e21ee40fd49b3e126c8ffb223bdd3405b1 (patch) | |
tree | 345a94ee5a2bf0c3a1c9b6902811f98f3ba93707 /www/galeon2 | |
parent | Update to 1.3a. (diff) |
Update to 1.3.1.
Notes
Notes:
svn path=/head/; revision=73731
Diffstat (limited to 'www/galeon2')
-rw-r--r-- | www/galeon2/Makefile | 39 | ||||
-rw-r--r-- | www/galeon2/distinfo | 2 | ||||
-rw-r--r-- | www/galeon2/files/patch-MyportalProtocolHandler.cpp | 11 | ||||
-rw-r--r-- | www/galeon2/files/patch-ab | 48 | ||||
-rw-r--r-- | www/galeon2/pkg-plist | 8 |
5 files changed, 85 insertions, 23 deletions
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 0b421d8c0290..3a85dd8256e3 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= galeon2 -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//} @@ -19,8 +19,21 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -MOZILLA= mozilla-devel-gtk2 +MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.2" + +.if !defined(WITH_MOZILLA) +MOZILLA= mozilla-gtk2 +HEADERS_SUFX= +.else +.if ${WITH_MOZILLA}=="mozilla-devel-gtk2" +MOZILLA= ${WITH_MOZILLA} HEADERS_SUFX= -devel +MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk" +.else +MOZILLA= mozilla +HEADERS_SUFX= +.endif +.endif USE_X_PREFIX= yes USE_GNOMENG= yes @@ -29,8 +42,8 @@ USE_LIBTOOL= yes USE_REINPLACE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \ - --with-mozilla-snapshot="trunk" \ - --enable-nautilus-view=no + --enable-nautilus-view=no \ + ${MOZ_CONFIGURE_ARGS} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} @@ -39,12 +52,20 @@ MAN1= galeon.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500000 +.if ${OSVERSION} < 500000 # Galeon does not build correctly in -CURRENT if -Werror is passed # to the compiler. -CONFIGURE_ARGS+= --disable-werror +CONFIGURE_ARGS+= --enable-werror .endif +post-extract: + @${ECHO_MSG} + @${ECHO_MSG} " By default the port uses www/mozilla-gtk2 for html rendering, but you can" + @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" + @${ECHO_MSG} + @${ECHO_MSG} " mozilla-devel-gtk2 " + @${ECHO_MSG} + post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @@ -53,6 +74,12 @@ post-patch: @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' +post-configure: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g ; \ + s|%%X11BASE%%|${X11BASE}|g ; \ + s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon + pre-install: @-${X11BASE}/bin/gconftool --shutdown diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo index fd17d4f4fe8a..871f8e6f80b8 100644 --- a/www/galeon2/distinfo +++ b/www/galeon2/distinfo @@ -1 +1 @@ -MD5 (galeon-1.3.0.tar.gz) = b4383d2153cd41fa1beb1e39a3272808 +MD5 (galeon-1.3.1.tar.gz) = 136f6d69e53fa9a6d66072f6c410a28d diff --git a/www/galeon2/files/patch-MyportalProtocolHandler.cpp b/www/galeon2/files/patch-MyportalProtocolHandler.cpp deleted file mode 100644 index 6539b8f248a5..000000000000 --- a/www/galeon2/files/patch-MyportalProtocolHandler.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/MyportalProtocolHandler.cpp.orig Thu Nov 7 01:40:46 2002 -+++ mozilla/MyportalProtocolHandler.cpp Thu Nov 7 01:40:55 2002 -@@ -26,7 +26,7 @@ - - extern "C" { - extern char *realpath (__const char *__restrict __name, -- char *__restrict __resolved) __THROW; -+ char *__restrict __resolved); - }; - - #include <stdlib.h> diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab new file mode 100644 index 000000000000..7624969406ff --- /dev/null +++ b/www/galeon2/files/patch-ab @@ -0,0 +1,48 @@ +--- src/galeon.in.orig Sat Dec 28 23:28:29 2002 ++++ src/galeon.in Sat Dec 28 23:31:42 2002 +@@ -4,18 +4,14 @@ + + if test -n "$MOZILLA_FIVE_HOME"; then + MOZILLA_HOME=$MOZILLA_FIVE_HOME +-elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then ++elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then + MOZILLA_HOME=@MOZILLA_HOME@ +-elif [ -f /usr/local/mozilla/chrome/comm.jar ]; then +- MOZILLA_HOME=/usr/local/mozilla +-elif [ -f /usr/lib/mozilla/chrome/comm.jar ]; then +- MOZILLA_HOME=/usr/lib/mozilla +-elif [ -f /opt/mozilla/chrome/comm.jar ]; then +- MOZILLA_HOME=/opt/mozilla +-elif [ -f /usr/lib/mozilla-0.9.7/chrome/comm.jar ]; then +- MOZILLA_HOME=/usr/lib/mozilla-0.9.7/ +-elif [ -f /opt/gnome/lib/mozilla/chrome/comm.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 +@@ -27,16 +23,12 @@ + 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 ++MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins ++export MOZ_PLUGIN_PATH + + 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/pkg-plist b/www/galeon2/pkg-plist index e689608ec344..75ba29dfd3ac 100644 --- a/www/galeon2/pkg-plist +++ b/www/galeon2/pkg-plist @@ -30,6 +30,7 @@ etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/galeon/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Netword/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security/%gconf.xml @@ -68,7 +69,6 @@ share/gnome/galeon/bookmarks-editor.glade share/gnome/galeon/bookmarks.glade share/gnome/galeon/default-bookmarks.xbel share/gnome/galeon/fetch_favicon.xpm -share/gnome/galeon/fonts.png share/gnome/galeon/freshmeat.png share/gnome/galeon/galeon-bookmark-alias-mark.png share/gnome/galeon/galeon-bookmark.png @@ -82,14 +82,12 @@ share/gnome/galeon/galeon-separator.png share/gnome/galeon/galeon-viewsource.png share/gnome/galeon/galeon.glade share/gnome/galeon/galeon.png -share/gnome/galeon/general.png share/gnome/galeon/google.png share/gnome/galeon/google_groups.png share/gnome/galeon/google_images.png share/gnome/galeon/imdb_movies.png share/gnome/galeon/logo.png share/gnome/galeon/myportal.css -share/gnome/galeon/network.png share/gnome/galeon/new_alias.xpm share/gnome/galeon/new_alias_small.xpm share/gnome/galeon/new_folder.xpm @@ -162,8 +160,6 @@ share/gnome/galeon/spinners/pipeon/013.png share/gnome/galeon/spinners/pipeon/014.png share/gnome/galeon/spinners/pipeon/rest.png share/gnome/galeon/stocks.png -share/gnome/galeon/stop.png -share/gnome/galeon/tabs.png share/gnome/galeon/toc.css share/gnome/galeon/toolbar-editor.glade share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml @@ -192,6 +188,7 @@ share/gnome/help/galeon/C/preferences.xml share/gnome/omf/galeon/galeon-C.omf share/gnome/pixmaps/galeon.png share/gnome/sounds/galeon/clicked.wav +share/locale/am/LC_MESSAGES/galeon-2.0.mo share/locale/az/LC_MESSAGES/galeon-2.0.mo share/locale/bg/LC_MESSAGES/galeon-2.0.mo share/locale/ca/LC_MESSAGES/galeon-2.0.mo @@ -265,6 +262,7 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Netword @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon |