-Update to 0.7.3.

-Remove the IGNORE, it doesn't crash anymore with Mono 1.1.7.

BSD# - Project by:	http://www.mono-project.com/Mono:FreeBSD

6 files changed, 30 insertions, 150 deletions

diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index 787facb4a332..4e774ff7aea3 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gfax
-PORTVERSION=	0.6.4
-PORTREVISION=	4
+PORTVERSION=	0.7.3
 CATEGORIES=	comms print gnome
 MASTER_SITES=	http://gfax.cowlug.org/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	A GNOME-2.x C# pop-up fax manager
@@ -19,35 +19,23 @@ BUILD_DEPENDS=	${X11BASE}/lib/mono/gtk-sharp/gtk-sharp.dll:${PORTSDIR}/x11-toolk
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/sendfax:${PORTSDIR}/comms/hylafax
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehier libgnomeprint
+STRIP=
 
-IGNORE=		does not run
-
-.include <bsd.port.pre.mk>
-
-MAKE_ENV+=	SETENV="/usr/bin/env" \
-		MKDIR="/bin/mkdir -p" \
-		CHMOD="/bin/chmod" \
-		RM="/bin/rm" \
-		SH="${LOCALBASE}/bin/bash"
+GCONF_SCHEMAS=gfax.schema
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
-		${WRKSRC}/gfax \
-		${WRKSRC}/gfaxlpr \
+		${WRKSRC}/gfax.in \
+		${WRKSRC}/gfaxlpr.in \
 		${WRKSRC}/scripts/printer-setup.sh
-	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' \
-		${WRKSRC}/gfax ${WRKSRC}/gfaxlpr
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 		${WRKSRC}/scripts/printer-setup.sh
 
-do-build:
-	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} all
-
-do-install:
-	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} install
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/gfax/distinfo b/comms/gfax/distinfo
index 75dc77d4a2c1..1c91bede90f8 100644
--- a/comms/gfax/distinfo
+++ b/comms/gfax/distinfo
@@ -1,2 +1,2 @@
-MD5 (gfax-0.6.4.tar.gz) = 9ec7185ed012607fa529b5758e02e0d2
-SIZE (gfax-0.6.4.tar.gz) = 150904
+MD5 (gfax-0.7.3-1.tar.gz) = 59e1430ae0936508ef3814185890213c
+SIZE (gfax-0.7.3-1.tar.gz) = 749681
diff --git a/comms/gfax/files/patch-Makefile b/comms/gfax/files/patch-Makefile
deleted file mode 100644
index f93ec334816e..000000000000
--- a/comms/gfax/files/patch-Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
---- Makefile.orig	Wed Jun 30 18:27:25 2004
-+++ Makefile	Sat Jan  8 18:54:20 2005
-@@ -1,4 +1,3 @@
--export MONO_PATH=/usr/lib/mono:/usr/lib/mono/gtk-sharp
- 
- MCS = mcs /define:DEBUG
- #MCS = mcs /define:DEBUGHYLAFAX
-@@ -11,9 +10,7 @@
- 		/resource:./pixmaps/gfax.png,gfax.png \
- 		/resource:./pixmaps/send.png,send.png 
- 
--			
--REFERENCES = -r gnome-sharp -r gtk-sharp -r glib-sharp -r glade-sharp -r gdk-sharp \
--			 -r gconf-sharp -r gconf-sharp-peditors.dll
-+REFERENCES = $(shell pkg-config --libs gnome-sharp glade-sharp gconf-sharp)
- SOURCES = 	src/phonebook.cs \
- 			src/gui.cs \
- 			src/main.cs \
-@@ -22,7 +19,7 @@
- 			src/fax.cs \
- 			src/hylafax.cs \
- 			src/Settings.cs
--			
-+
- DATE=`date +%y-%m-%d`
- 
- all: mono-gfax.exe
-@@ -31,37 +28,43 @@
- 	$(MCS) $(RESOURCES) -o $@ $(SOURCES) $(REFERENCES)
- 
- schema:
--	env GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule $(SCHEMA)
-+	${SETENV} GCONF_CONFIG_SOURCE="xml::${PREFIX}/etc/gconf/gconf.xml.defaults" gconftool-2 --makefile-install-rule $(SCHEMA)
- 	gconfsharp-schemagen gfax $(SCHEMA) > ./src/Settings.cs
- 
- tar:
- 	cd ..; tar cvzf mg.$(DATE).tar.gz mono-gfax
--	
-+
- install: mono-gfax.exe
--	mkdir -p $(prefix)/bin
--	mkdir -p /usr/share/gfax
--	mkdir -p /var/spool/gfax
--	chmod 777 /var/spool/gfax
--	$(INSTALL) -m 755 mono-gfax.exe /usr/bin/mono-gfax.exe
--	$(INSTALL) -m 755 gfax /usr/bin/gfax
--	$(INSTALL) -m 755 gfaxlpr /usr/bin/gfaxlpr
--	$(INSTALL) -m 755 pixmaps/gfax.png /usr/share/pixmaps/
--	$(INSTALL) -m 755 data/gfax.desktop /usr/share/applications/
--	$(INSTALL) -m 755 data/fax-g3.profile /usr/share/gfax/
--	$(INSTALL) -m 755 data/GFAX.xml /usr/share/gfax/
--	$(INSTALL) -m 755 data/GNOME-GFAX-PS.xml /usr/share/gfax/
--	$(INSTALL) -m 755 scripts/printer-setup.sh /usr/share/gfax/
--	env GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule $(SCHEMA)
--	./scripts/printer-setup.sh --install
-+	${MKDIR} ${PREFIX}/bin
-+	${MKDIR} ${PREFIX}/share/gnome/pixmaps
-+	${MKDIR} ${PREFIX}/share/gnome/applications
-+	${MKDIR} ${PREFIX}/share/gnome/gfax
-+	${MKDIR} ${PREFIX}/etc/gconf/schemas
-+	${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults
-+	${MKDIR} /var/spool/gfax
-+	${CHMOD} 777 /var/spool/gfax
-+	${BSD_INSTALL_SCRIPT} mono-gfax.exe ${PREFIX}/bin/mono-gfax.exe
-+	${BSD_INSTALL_SCRIPT} gfax ${PREFIX}/bin/gfax
-+	${BSD_INSTALL_SCRIPT} gfaxlpr ${PREFIX}/bin/gfaxlpr
-+	${BSD_INSTALL_DATA} pixmaps/gfax.png ${PREFIX}/share/gnome/pixmaps/
-+	${BSD_INSTALL_DATA} data/gfax.desktop ${PREFIX}/share/gnome/applications/
-+	${BSD_INSTALL_DATA} data/fax-g3.profile ${PREFIX}/share/gnome/gfax/
-+	${BSD_INSTALL_DATA} data/GFAX.xml ${PREFIX}/share/gnome/gfax/
-+	${BSD_INSTALL_DATA} data/GNOME-GFAX-PS.xml ${PREFIX}/share/gnome/gfax/
-+	${BSD_INSTALL_SCRIPT} scripts/printer-setup.sh ${PREFIX}/share/gnome/gfax/
-+	${BSD_INSTALL_DATA} $(SCHEMA) ${PREFIX}/etc/gconf/schemas/gfax.schema
-+	${SETENV} GCONF_CONFIG_SOURCE="xml::${PREFIX}/etc/gconf/gconf.xml.defaults" gconftool-2 --makefile-install-rule ${PREFIX}/etc/gconf/schemas/gfax.schema
-+	${SH} ${PREFIX}/share/gnome/gfax/printer-setup.sh --install
- 
- uninstall:
--	rm -f /usr/bin/mono-gfax.exe
--	rm -f /usr/bin/gfax
--	rm -f /usr/bin/gfaxlpr
--	rm -f /usr/share/pixmaps/gfax.png
--	rm -f /usr/share/applications/gfax.desktop
--	/usr/share/gfax/printer-setup.sh --remove
--	rm -rf /usr/share/gfax
--	
-+	${RM} -f ${PREFIX}/bin/mono-gfax.exe
-+	${RM} -f ${PREFIX}/bin/gfax
-+	${RM} -f ${PREFIX}/bin/gfaxlpr
-+	${RM} -f ${PREFIX}/share/gnome/pixmaps/gfax.png
-+	${RM} -f ${PREFIX}/share/gnome/applications/gfax.desktop
-+	${SETENV} GCONF_CONFIG_SOURCE="xml::${PREFIX}/etc/gconf/gconf.xml.defaults" gconftool-2 --makefile-uninstall-rule ${PREFIX}/etc/gconf/schemas/gfax.schema
-+	${SH} ${PREFIX}/share/gnome/gfax/printer-setup.sh --remove
-+	${RM} -rf ${PREFIX}/share/gnome/gfax
-+
- clean:
--	-rm *.exe
-+	-${RM} -f *.exe
diff --git a/comms/gfax/files/patch-gfax b/comms/gfax/files/patch-gfax.in
index c0d4fcc8b594..16e681a622f0 100644
--- a/comms/gfax/files/patch-gfax
+++ b/comms/gfax/files/patch-gfax.in
@@ -1,14 +1,14 @@
---- gfax.orig	Thu Jul  8 22:56:38 2004
-+++ gfax	Thu Jul  8 23:48:36 2004
-@@ -11,24 +11,20 @@
+--- gfax.in.orig	Mon Jan 31 18:03:09 2005
++++ gfax.in	Thu May 12 18:12:41 2005
+@@ -11,19 +11,19 @@
  #  CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECT-
  #  ION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  #
 -RNAME=G$$
  # don't change this spool directory, gfax uses it.
- SPOOL_DIR=/var/spool/gfax
+-SPOOL_DIR=@eprefix@/var/spool/gfax
++SPOOL_DIR=/var/spool/gfax
 +RNAME=`mktemp -q $SPOOL_DIR/D.XXXXXX` || exit 1
- MYPATH=/usr/bin
  STD=no
  
  if [ -s /dev/stdin ]; then
@@ -17,14 +17,10 @@
  	STD=yes
  fi
  
--if [ "$(pwd)" = "/home/george/Projects/gfax" ]; then
--	MYPATH=/home/george/Projects/gfax
--fi
--
  if [ $STD = "yes" ]; then
--	mono $MYPATH/mono-gfax.exe -f $SPOOL_DIR/D.$RNAME
+-	exec mono @prefix@/lib/gfax/gfax.exe -f $SPOOL_DIR/D.$RNAME &
 -	#rm -f $SPOOL_DIR/D.$RNAME
-+	mono $MYPATH/mono-gfax.exe -f $RNAME
++	exec mono @prefix@/lib/gfax/gfax.exe -f $RNAME &
 +	#rm -f $RNAME
  	exit 0
  fi
diff --git a/comms/gfax/files/patch-gfaxlpr b/comms/gfax/files/patch-gfaxlpr.in
index 94cfc7f80402..202243ce5f58 100644
--- a/comms/gfax/files/patch-gfaxlpr
+++ b/comms/gfax/files/patch-gfaxlpr.in
@@ -1,16 +1,16 @@
---- gfaxlpr.orig	Thu Jul  8 23:11:51 2004
-+++ gfaxlpr	Thu Jul  8 23:50:40 2004
-@@ -11,10 +11,10 @@
+--- gfaxlpr.in.orig	Mon Jan 31 18:03:09 2005
++++ gfaxlpr.in	Thu May 12 18:15:39 2005
+@@ -11,9 +11,9 @@
  #  CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECT-
  #  ION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  #
 -RNAME=G$$
  # don't change this spool directory, gfax uses it.
- SPOOL_DIR=/var/spool/gfax
+-SPOOL_DIR=@eprefix@/var/spool/gfax
++SPOOL_DIR=/var/spool/gfax
 +RNAME=`mktemp -q $SPOOL_DIR/D.XXXXXX`
- MYPATH=/usr/bin
  
 -cat > $SPOOL_DIR/D.$RNAME
--mono $MYPATH/mono-gfax.exe -f $SPOOL_DIR/D.$RNAME
+-exec mono @prefix@/lib/gfax/gfax.exe -f $SPOOL_DIR/D.$RNAME &
 +cat > $RNAME
-+mono $MYPATH/mono-gfax.exe -f $RNAME
++exec mono @prefix@/lib/gfax/gfax.exe -f $RNAME &
diff --git a/comms/gfax/pkg-plist b/comms/gfax/pkg-plist
index fe1a9614a141..a038119423e7 100644
--- a/comms/gfax/pkg-plist
+++ b/comms/gfax/pkg-plist
@@ -1,15 +1,8 @@
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gfax.schema > /dev/null || /usr/bin/true
-etc/gconf/schemas/gfax.schema
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gfax.schema > /dev/null || /usr/bin/true
-@unexec %D/share/gnome/gfax/printer-setup.sh --remove
-share/gnome/gfax/printer-setup.sh
-@exec %D/share/gnome/gfax/printer-setup.sh --install
 bin/gfax
 bin/gfaxlpr
-bin/mono-gfax.exe
+lib/gfax/gfax.exe
 share/gnome/applications/gfax.desktop
-share/gnome/gfax/GFAX.xml
-share/gnome/gfax/GNOME-GFAX-PS.xml
-share/gnome/gfax/fax-g3.profile
+share/gnome/libgnomeprint/models/GNOME-GFAX-PS.xml
+share/gnome/libgnomeprint/printers/GFAX.xml
 share/gnome/pixmaps/gfax.png
-@dirrm share/gnome/gfax
+share/gnome/pixmaps/send.png