- unbreak build by upgrading to version 1.4.8

- avoid linking to devel/nspr if installed
- prepare for mozilla versioning (adjust MOZDIR as needed)

With help from maintainer Igor Boehm
okay pval@
This commit is contained in:
kurt 2005-03-16 02:02:56 +00:00
parent a34ec5141c
commit 9346cba7d2
5 changed files with 115 additions and 55 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2005/01/18 08:11:38 wilfried Exp $
# $OpenBSD: Makefile,v 1.3 2005/03/16 02:02:56 kurt Exp $
COMMENT= "extremely lightweight and simple web browser for gnome"
V= 1.2.10
M= 1.4
V= 1.4.8
DISTNAME= epiphany-${V}
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}
CATEGORIES= www
HOMEPAGE= http://www.gnome.org/projects/epiphany/
@ -17,37 +18,42 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/1.2/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/$M/}
EXTRACT_SUFX= .tar.bz2
MOZDIR= mozilla
BUILD_DEPENDS= :mozilla-devel-*-gtk2:www/mozilla,-devel,gtk2 \
:pkgconfig-*:devel/pkgconfig \
:p5-XML-Parser-*:textproc/p5-XML-Parser \
:scrollkeeper-*:textproc/scrollkeeper
RUN_DEPENDS= :gnome-desktop-*:x11/gnome/desktop \
:gnome-themes-*:x11/gnome/themes \
:hicolor-icon-theme-*:x11/hicolor-icon-theme
:gnome-icon-theme-*:x11/gnome/icon-theme
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
mozilla/gtkembedmoz,mozilla/nspr4,mozilla/plc4,mozilla/plds4,mozilla/xpcom:mozilla-*-gtk2:www/mozilla,gtk2
${MOZDIR}/gtkembedmoz,${MOZDIR}/nspr4,${MOZDIR}/plc4,${MOZDIR}/plds4,${MOZDIR}/xpcom:mozilla-*-gtk2:www/mozilla,gtk2
WANTLIB= ORBit-2 ORBitCosNaming-2 art_lgpl_2 atk-1.0.0.0 \
audiofile bonobo-2 bonobo-activation bonoboui-2 esd \
gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
glib-2.0.0.0 gmodule-2.0.0.0 gtk-x11-2.0.0.0 iconv \
intl jpeg gnome-2 gnome-keyring gnomecanvas-2 \
gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 pango-1.0.0.0 \
pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
popt xml2 ICE SM X11 Xcursor Xext Xft Xinerama \
Xrender c crypto fontconfig freetype m pthread ssl \
stdc++ z
WANTLIB= ORBit-2 ORBitCosNaming-2 art_lgpl_2 atk-1.0.0.0 \
audiofile bonobo-2 bonobo-activation bonoboui-2 esd \
gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
glib-2.0.0.0 gmodule-2.0.0.0 gtk-x11-2.0.0.0 iconv \
intl jpeg gnome-2 gnome-keyring gnomecanvas-2 \
gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 pango-1.0.0.0 \
pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
popt xml2 ICE SM X11 Xcursor Xext Xft Xinerama \
Xrender c crypto fontconfig freetype m pthread ssl \
stdc++ z
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED}
CONFIGURE_ARGS+=--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/epiphany \
--program-suffix=-bin \
--disable-schemas-install
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/${MOZDIR} -L${LOCALBASE}/lib"
SUBST_VARS+= M
post-patch:
@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
@ -55,6 +61,8 @@ post-patch:
post-install:
@rm -f ${PREFIX}/bin/epiphany
${INSTALL_SCRIPT} ${FILESDIR}/epiphany ${PREFIX}/bin
@perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' ${PREFIX}/bin/epiphany
@perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' \
-e 's|%%MOZDIR%%|${MOZDIR}|g;'\
${PREFIX}/bin/epiphany
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (epiphany-1.2.10.tar.bz2) = c2418367f79cde9bac0f8a923455e7c0
RMD160 (epiphany-1.2.10.tar.bz2) = dcc9e31864de651207b91442dd94872e1f687aa9
SHA1 (epiphany-1.2.10.tar.bz2) = 77efd9089dd79294ad04f3bbd93a412d783b4d1b
SIZE (epiphany-1.2.10.tar.bz2) = 3001789
MD5 (epiphany-1.4.8.tar.bz2) = bb9bdb92c5b4a7a97029e942304a9373
RMD160 (epiphany-1.4.8.tar.bz2) = 5e626ec1ab08a88a15e5b787ae690056ffbf3c21
SHA1 (epiphany-1.4.8.tar.bz2) = 35ca720d1f3c58a9d3c17115a63146fb1a62c44f
SIZE (epiphany-1.4.8.tar.bz2) = 3594408

View File

@ -1,6 +1,6 @@
:
MOZILLA_HOME=%%LOCALBASE%%/mozilla
MOZILLA_HOME=%%LOCALBASE%%/%%MOZDIR%%
if [ -z "$MOZ_PLUGIN_PATH" ]; then
MOZ_PLUGIN_PATH=~/.mozilla/plugins/

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-embed_mozilla_Makefile_in,v 1.1 2005/03/16 02:02:57 kurt Exp $
--- embed/mozilla/Makefile.in.orig Thu Mar 10 11:25:15 2005
+++ embed/mozilla/Makefile.in Thu Mar 10 11:25:44 2005
@@ -298,6 +298,7 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_s
-I$(MOZILLA_INCLUDE_ROOT)/docshell \
-I$(MOZILLA_INCLUDE_ROOT)/dom \
-I$(MOZILLA_INCLUDE_ROOT)/exthandler \
+ -I$(MOZILLA_INCLUDE_ROOT)/find \
-I$(MOZILLA_INCLUDE_ROOT)/gfx \
-I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \
-I$(MOZILLA_INCLUDE_ROOT)/js -I$(MOZILLA_INCLUDE_ROOT)/history \
@@ -309,6 +310,7 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_s
-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
-I$(MOZILLA_INCLUDE_ROOT)/pipboot \
-I$(MOZILLA_INCLUDE_ROOT)/pipnss \
+ -I$(MOZILLA_INCLUDE_ROOT)/pref \
-I$(MOZILLA_INCLUDE_ROOT)/shistory \
-I$(MOZILLA_INCLUDE_ROOT)/uriloader \
-I$(MOZILLA_INCLUDE_ROOT)/uconv \

View File

@ -1,35 +1,37 @@
@comment $OpenBSD: PLIST,v 1.2 2005/01/18 08:08:42 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.3 2005/03/16 02:02:57 kurt Exp $
bin/epiphany
bin/epiphany-bin
include/epiphany-1.2/
include/epiphany-1.2/epiphany/
include/epiphany-1.2/epiphany/ephy-bookmarks.h
include/epiphany-1.2/epiphany/ephy-command-manager.h
include/epiphany-1.2/epiphany/ephy-cookie-manager.h
include/epiphany-1.2/epiphany/ephy-dialog.h
include/epiphany-1.2/epiphany/ephy-embed-event.h
include/epiphany-1.2/epiphany/ephy-embed-persist.h
include/epiphany-1.2/epiphany/ephy-embed-prefs.h
include/epiphany-1.2/epiphany/ephy-embed-shell.h
include/epiphany-1.2/epiphany/ephy-embed-single.h
include/epiphany-1.2/epiphany/ephy-embed.h
include/epiphany-1.2/epiphany/ephy-encodings.h
include/epiphany-1.2/epiphany/ephy-extension.h
include/epiphany-1.2/epiphany/ephy-history.h
include/epiphany-1.2/epiphany/ephy-node-db.h
include/epiphany-1.2/epiphany/ephy-node.h
include/epiphany-1.2/epiphany/ephy-notebook.h
include/epiphany-1.2/epiphany/ephy-password-manager.h
include/epiphany-1.2/epiphany/ephy-permission-manager.h
include/epiphany-1.2/epiphany/ephy-session.h
include/epiphany-1.2/epiphany/ephy-shell.h
include/epiphany-1.2/epiphany/ephy-statusbar.h
include/epiphany-1.2/epiphany/ephy-tab.h
include/epiphany-1.2/epiphany/ephy-window.h
include/epiphany-${M}/
include/epiphany-${M}/epiphany/
include/epiphany-${M}/epiphany/ephy-bookmarks.h
include/epiphany-${M}/epiphany/ephy-command-manager.h
include/epiphany-${M}/epiphany/ephy-cookie-manager.h
include/epiphany-${M}/epiphany/ephy-dialog.h
include/epiphany-${M}/epiphany/ephy-embed-event.h
include/epiphany-${M}/epiphany/ephy-embed-factory.h
include/epiphany-${M}/epiphany/ephy-embed-persist.h
include/epiphany-${M}/epiphany/ephy-embed-prefs.h
include/epiphany-${M}/epiphany/ephy-embed-shell.h
include/epiphany-${M}/epiphany/ephy-embed-single.h
include/epiphany-${M}/epiphany/ephy-embed.h
include/epiphany-${M}/epiphany/ephy-encodings.h
include/epiphany-${M}/epiphany/ephy-extension.h
include/epiphany-${M}/epiphany/ephy-history.h
include/epiphany-${M}/epiphany/ephy-node-db.h
include/epiphany-${M}/epiphany/ephy-node.h
include/epiphany-${M}/epiphany/ephy-notebook.h
include/epiphany-${M}/epiphany/ephy-password-manager.h
include/epiphany-${M}/epiphany/ephy-permission-manager.h
include/epiphany-${M}/epiphany/ephy-session.h
include/epiphany-${M}/epiphany/ephy-shell.h
include/epiphany-${M}/epiphany/ephy-statusbar.h
include/epiphany-${M}/epiphany/ephy-tab.h
include/epiphany-${M}/epiphany/ephy-window.h
lib/bonobo/
lib/bonobo/servers/
lib/bonobo/servers/GNOME_Epiphany_Automation.server
lib/pkgconfig/epiphany-1.2.pc
lib/pkgconfig/epiphany-${M}.pc
@man man/man1/epiphany-bin.1
share/application-registry/
share/application-registry/epiphany.applications
share/applications/
@ -38,16 +40,18 @@ share/applications/epiphany.desktop
share/epiphany/
share/epiphany/art/
share/epiphany/art/epiphany-bookmarks.png
share/epiphany/art/epiphany-close-tab.png
share/epiphany/art/epiphany-download.png
share/epiphany/art/epiphany-entry.png
share/epiphany/art/epiphany-history.png
share/epiphany/art/epiphany-popup-hidden.png
share/epiphany/art/epiphany-secure.png
share/epiphany/art/epiphany-tab-loading.gif
share/epiphany/art/epiphany-unsecure.png
share/epiphany/art/hand-open.png
share/epiphany/conspiracy.xhtml
share/epiphany/default-prefs.js
share/epiphany/epiphany-bookmark-editor-ui.xml
share/epiphany/epiphany-bookmarksbar.xml
share/epiphany/epiphany-fs-toolbar.xml
share/epiphany/epiphany-history-window-ui.xml
share/epiphany/epiphany-toolbar.xml
@ -59,7 +63,6 @@ share/epiphany/glade/epiphany.glade
share/epiphany/glade/prefs-dialog.glade
share/epiphany/glade/print.glade
share/epiphany/mime-types-permissions.xml
share/epiphany/nautilus-epiphany-view.xml
share/gnome/help/epiphany/
share/gnome/help/epiphany/C/
share/gnome/help/epiphany/C/epiphany.xml
@ -83,15 +86,39 @@ share/gnome/help/epiphany/eu/figures/
share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/eu/figures/ephy-screenshot.png
share/gnome/help/epiphany/eu/legal.xml
share/gnome/help/epiphany/fi/
share/gnome/help/epiphany/fi/epiphany.xml
share/gnome/help/epiphany/fi/figures/
share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-screenshot.png
share/gnome/help/epiphany/fi/legal.xml
share/gnome/help/epiphany/ja/
share/gnome/help/epiphany/ja/epiphany.xml
share/gnome/help/epiphany/ja/figures/
share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/ja/figures/ephy-screenshot.png
share/gnome/help/epiphany/ja/legal.xml
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/epiphany/
share/gtk-doc/html/epiphany/EphyCommandManager.html
share/gtk-doc/html/epiphany/EphyEmbed.html
share/gtk-doc/html/epiphany/EphyEmbedPersist.html
share/gtk-doc/html/epiphany/EphyEmbedSingle.html
share/gtk-doc/html/epiphany/EphyNodeDb.html
share/gtk-doc/html/epiphany/EphyPermissionManager.html
share/gtk-doc/html/epiphany/EphyTab.html
share/gtk-doc/html/epiphany/EphyWindow.html
share/gtk-doc/html/epiphany/ch01.html
share/gtk-doc/html/epiphany/ch02.html
share/gtk-doc/html/epiphany/epiphany-EphyEmbedFactory.html
share/gtk-doc/html/epiphany/epiphany-EphyGlade.html
share/gtk-doc/html/epiphany/epiphany-ephy-cookie-manager.html
share/gtk-doc/html/epiphany/epiphany-ephy-embed-factory.html
share/gtk-doc/html/epiphany/epiphany-ephy-embed-single.html
share/gtk-doc/html/epiphany/epiphany-ephy-password-manager.html
share/gtk-doc/html/epiphany/epiphany-ephy-permission-manager.html
share/gtk-doc/html/epiphany/epiphany-ephy-session.html
share/gtk-doc/html/epiphany/epiphany-ephy-shell.html
share/gtk-doc/html/epiphany/epiphany.devhelp
@ -107,6 +134,7 @@ share/locale/az/LC_MESSAGES/epiphany.mo
share/locale/be/LC_MESSAGES/epiphany.mo
share/locale/bg/LC_MESSAGES/epiphany.mo
share/locale/bn/LC_MESSAGES/epiphany.mo
share/locale/bs/LC_MESSAGES/epiphany.mo
share/locale/ca/LC_MESSAGES/epiphany.mo
share/locale/cs/LC_MESSAGES/epiphany.mo
share/locale/cy/LC_MESSAGES/epiphany.mo
@ -139,6 +167,8 @@ share/locale/mk/LC_MESSAGES/epiphany.mo
share/locale/ml/LC_MESSAGES/epiphany.mo
share/locale/mn/LC_MESSAGES/epiphany.mo
share/locale/ms/LC_MESSAGES/epiphany.mo
share/locale/nb/LC_MESSAGES/epiphany.mo
share/locale/ne/LC_MESSAGES/epiphany.mo
share/locale/nl/LC_MESSAGES/epiphany.mo
share/locale/nn/LC_MESSAGES/epiphany.mo
share/locale/no/LC_MESSAGES/epiphany.mo
@ -163,10 +193,13 @@ share/locale/vi/LC_MESSAGES/epiphany.mo
share/locale/wa/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
share/omf/
share/omf/epiphany/
share/omf/epiphany/epiphany-C.omf
share/omf/epiphany/epiphany-es.omf
share/omf/epiphany/epiphany-eu.omf
share/omf/epiphany/epiphany-fi.omf
share/omf/epiphany/epiphany-ja.omf
share/pixmaps/epiphany-bookmarks.png
share/schemas/
share/schemas/epiphany/