On Mon, 23 Jul 2007, Charles Longeau wrote:
To make it build I had to add a BUILD_DEPENDS on scrollkeeper, I hope that
was the right way to do it.
Actually, it needs a bit more than that.
Here's a new diff.
Jason, ok to commit?
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/comms/gmfsk/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 11 Jul 2007 14:25:54 -0000 1.2
+++ Makefile 23 Jul 2007 19:04:04 -0000
@@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2007/07/11 14:25:54 aanriot Exp $
-COMMENT= "Gnome multimode HF terminal"
+COMMENT= Gnome multimode HF terminal
DISTNAME= gmfsk-0.6
+PKGNAME= ${DISTNAME}p0
CATEGORIES= comms hamradio
HOMEPAGE= http://gmfsk.connect.fi/
@@ -11,6 +12,7 @@
MAINTAINER= Jason Wright <[EMAIL PROTECTED]>
+# GPL - FDL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -23,16 +25,23 @@
png ORBit-2 art_lgpl_2 bonobo-2 bonobo-activation bonoboui-2 \
gconf-2 gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 popt xml2
+RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper
+BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= fftw.>=2::math/fftw \
gtk-x11-2.0,gdk_pixbuf-2.0,gdk-x11-2.0::x11/gtk+2 \
hamlib.>=2::comms/hamlib \
gnomeui-2::x11/gnome/libgnomeui
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --enable-hamlib --disable-schemas-install
+CONFIGURE_ARGS= --enable-hamlib \
+ --disable-schemas-install \
+
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gmfsk
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_X11= Yes
+
+post-patch:
+ @ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
.include <bsd.port.mk>
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 23 Jul 2007 19:04:04 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Mon Jul 23 20:47:40 2007
++++ Makefile.in Mon Jul 23 20:47:54 2007
+@@ -598,8 +598,6 @@ install-data-local:
+ fi \
+ done \
+ fi
+- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+- $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gmfsk.schemas
+
+ dist-hook:
+ if test -d pixmaps; then \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/comms/gmfsk/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 28 May 2007 18:47:06 -0000 1.1.1.1
+++ pkg/PLIST 23 Jul 2007 19:04:04 -0000
@@ -12,7 +12,6 @@
share/gnome/help/gmfsk/C/figures/warning.png
share/gnome/help/gmfsk/C/gmfsk.xml
share/gnome/help/gmfsk/C/legal.xml
-share/omf/
share/omf/gmfsk/
share/omf/gmfsk/gmfsk-C.omf
share/pixmaps/
@@ -23,3 +22,10 @@
share/pixmaps/gmfsk/rx.xpm
share/pixmaps/gmfsk/tune.xpm
share/pixmaps/gmfsk/tx.xpm
[EMAIL PROTECTED] GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gmfsk/*.schemas >
/dev/null
+share/schemas/
+share/schemas/gmfsk/
+share/schemas/gmfsk/gmfsk.schemas
[EMAIL PROTECTED] GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gmfsk/*.schemas >
/dev/null
[EMAIL PROTECTED] %D/bin/scrollkeeper-update -q
[EMAIL PROTECTED] %D/bin/scrollkeeper-update -q
