cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly handle GConf schemas and scrollkeeper omf files. Should make

Browse Source 
it work when installed as a package now.
This commit is contained in:
marcm 2003-07-04 06:41:12 +00:00
parent 60b87f1c8e
commit 62d728dc7a
4 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
www/galeon/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2003/07/01 11:11:31 wilfried Exp $
# $OpenBSD: Makefile,v 1.4 2003/07/04 06:41:12 marcm Exp $
COMMENT= "GNOME web browser based on gecko"
@ -17,26 +17,18 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/}
MODULE= iconv \
gettext
MODULE= gettext
BUILD_DEPENDS= :mozilla-${MOZ}:www/mozilla \
:mozilla-devel-${MOZ}:www/mozilla,-devel \
:scrollkeeper-*:textproc/scrollkeeper
RUN_DEPENDS= :mozilla-${MOZ}:www/mozilla
LIB_DEPENDS= audiofile::devel/libaudiofile \
esd::audio/esound \
tiff::graphics/tiff \
ungif::graphics/libungif \
gthread::devel/glib \
gdk_imlib::graphics/imlib \
LIB_DEPENDS= art_lgpl,gnomesupport,gnomeui::x11/gnome/libs \
gdk_pixbuf::graphics/gdk-pixbuf \
gconf-1,gconf-gtk-1::devel/gconf \
glade,glade-gnome::devel/libglade,gnome \
IIOP,ORBit,ORBitCosNaming,ORBitutil::devel/ORBit \
art_lgpl,gnome,gnomesupport,gnomeui::x11/gnome/libs \
gnomevfs::x11/gnome/vfs \
oaf::x11/gnome/oaf \
xml::textproc/libxml1
gnomevfs::x11/gnome/vfs
# gtkembedmoz,gtksuperwin,nspr4,plc4,plds4,xpcom::www/mozilla
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
@ -46,6 +38,7 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-werror \
--disable-scrollkeeper-update \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/galeon \
--with-mozilla-snapshot=${MOZ} \
--with-mozilla-home=${LOCALBASE}/mozilla \
--with-mozilla-libs=${LOCALBASE}/mozilla/lib \
@ -53,4 +46,8 @@ CONFIGURE_ARGS= --disable-werror \
WRKDIST= ${WRKDIR}/galeon-${V}/
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/schemas/galeon
${INSTALL_DATA} ${WRKSRC}/galeon.schemas ${PREFIX}/share/schemas/galeon/
.include <bsd.port.mk>

11
www/galeon/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.1 2003/07/04 06:41:12 marcm Exp $
--- Makefile.in.orig Thu Jul 3 22:40:28 2003
+++ Makefile.in Thu Jul 3 22:40:32 2003
@@ -852,7 +852,6 @@ uninstall-info: uninstall-info-recursive
@INTLTOOL_OAF_RULE@
install-schemas: galeon.schemas
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-1 --makefile-install-rule $(SCHEMAS_FILE)
@INSTALL_SCHEMAS_TRUE@install-data-local: install-schemas
# Tell versions [3.59,3.63) of GNU make to not export all variables.

16
www/galeon/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2003/07/01 11:11:31 wilfried Exp $
--- configure.orig Sun Apr 20 00:27:26 2003
+++ configure Mon Jun 16 15:31:06 2003
@@ -11707,6 +11707,7 @@ cat confdefs.h >>conftest.$ac_ext
$OpenBSD: patch-configure,v 1.3 2003/07/04 06:41:12 marcm Exp $
--- configure.orig Sun Jun 8 16:18:42 2003
+++ configure Thu Jul 3 22:32:12 2003
@@ -11708,6 +11708,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.2 2003/07/01 11:11:31 wilfried Exp $
#include <X11/extensions/Xinerama.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -11742,6 +11743,7 @@ _ACEOF
@@ -11743,6 +11744,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.2 2003/07/01 11:11:31 wilfried Exp $
#include <X11/extensions/Xinerama.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
@@ -11838,6 +11840,10 @@ USE_PTHREADS=
@@ -11839,6 +11841,10 @@ USE_PTHREADS=
_PTHREAD_CFLAGS=""
_PTHREAD_LDFLAGS=""
case "$OS_ARCH" in
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.2 2003/07/01 11:11:31 wilfried Exp $
NetBSD)
;;
FreeBSD)
@@ -12341,7 +12347,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
@@ -12342,7 +12348,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
CC="$_save_cc"
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.2 2003/07/01 11:11:31 wilfried Exp $
echo "$as_me:$LINENO: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
echo $ECHO_N "checking for gdk_superwin_get_type in -lgtksuperwin... $ECHO_C" >&6
if test "${ac_cv_lib_gtksuperwin_gdk_superwin_get_type+set}" = set; then
@@ -12401,14 +12407,14 @@ if test $ac_cv_lib_gtksuperwin_gdk_super
@@ -12402,14 +12408,14 @@ if test $ac_cv_lib_gtksuperwin_gdk_super
fi

8
www/galeon/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2003/07/01 11:11:31 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/07/04 06:41:12 marcm Exp $
bin/galeon
bin/galeon-bin
bin/galeon-config-tool
@ -328,9 +328,12 @@ share/oaf/GNOME_Galeon_Automation.oaf
share/oaf/GNOME_Galeon_NautilusView.oaf
share/omf/galeon/galeon-manual-C.omf
share/pixmaps/galeon.png
share/schemas/galeon/galeon.schemas
share/sounds/galeon/clicked.wav
@dirrm share/sounds/galeon
@comment @dirrm share/sounds
@dirrm share/schemas/galeon
@comment @dirrm share/schemas
@comment @dirrm share/pixmaps
@dirrm share/omf/galeon
@comment @dirrm share/omf
@ -437,3 +440,6 @@ share/sounds/galeon/clicked.wav
@dirrm share/galeon
@dirrm lib/galeon/components
@dirrm lib/galeon
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-1 --get-default-source` %D/bin/gconftool-1 --makefile-install-rule %D/share/schemas/galeon/*.schemas > /dev/null
@exec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-update -q
@unexec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-update -q