- Update to 0.6.4

PR:		ports/69119
Submitted by:	John Merryweather Cooper <johnmary@adelphia.net> (maintainer)

7 files changed, 225 insertions, 81 deletions

diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index 16a8090..cc98f60 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -6,59 +6,45 @@
 #
 
 PORTNAME=	gfax
-PORTVERSION=	0.5
-PORTREVISION=	1
-CATEGORIES=	comms print
+PORTVERSION=	0.6.4
+CATEGORIES=	comms print gnome
 MASTER_SITES=	http://gfax.cowlug.org/
 
 MAINTAINER=	coop9211@uidaho.edu
-COMMENT=	A GNOME pop-up fax manager
+COMMENT=	A GNOME-2.x C# pop-up fax manager
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
+BUILD_DEPENDS=	${LOCALBASE}/lib/mono/gtk-sharp/gtk-sharp.dll:${PORTSDIR}/x11-toolkits/gtk-sharp \
+		bash:${PORTSDIR}/shells/bash2
+RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/sendfax:${PORTSDIR}/comms/hylafax
 
-USE_PYTHON=	yes
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
-NO_BUILD=	yes
+USE_GNOME=	gnomeprefix gnomehier libgnomeprint
 
-BASEFILES=	controller.py en.h fax-g3.profile fax.py file_handler.py \
-		gfax.desktop gfax.glade gfax.png gfax.py gfax.spec \
-		hfaxlib.py install.sh mgettydruid.glade prefs.py \
-		prefs_ui.py setup.glade ui.py uninstall.sh
+.include <bsd.port.pre.mk>
 
-PIXFILES=	gfax.png gnome-logo-icon-transparent.png
-DOCFILES=	AUTHORS COPYING Changelog HACKING INSTALL TODO
+MAKE_ENV+=	SETENV="/usr/bin/env" \
+		MKDIR="/bin/mkdir -p" \
+		CHMOD="/bin/chmod" \
+		RM="/bin/rm" \
+		SH="${LOCALBASE}/bin/bash"
 
-post-extract:
-	@${REINPLACE_CMD} -e 's|/usr/lib/gfax|${PREFIX}/lib/gfax|g' \
-		${WRKSRC}/gfax.py
-	@${REINPLACE_CMD} -e 's|/usr/share/gfax|${PREFIX}/share/gfax|g ; \
-		s|/usr/lib/gfax|${PREFIX}/lib/gfax|g' \
-		${WRKSRC}/prefs.py
+post-patch:
+	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+		${WRKSRC}/gfax \
+		${WRKSRC}/gfaxlpr \
+		${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:
-	@${MKDIR} ${PREFIX}/lib/gfax
-	@${MKDIR} ${PREFIX}/lib/gfax/pixmaps
-	@${MKDIR} ${PREFIX}/share/gnome/apps/Applications
-	@${MKDIR} ${PREFIX}/share/gnome/ximian
-	@${MKDIR} ${PREFIX}/share/gnome/ximian/Programs
-	@${MKDIR} ${PREFIX}/share/gnome/ximian/Programs/Utilities
-.for base in ${BASEFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${base} ${PREFIX}/lib/gfax
-.endfor
-	@${INSTALL_SCRIPT} ${WRKSRC}/gfax.py ${PREFIX}/bin/gfax
-	@${INSTALL_DATA} ${WRKSRC}/gfax.desktop ${PREFIX}/share/gnome/apps/Applications
-	@${INSTALL_DATA} ${WRKSRC}/gfax.desktop ${PREFIX}/share/gnome/ximian/Programs/Utilities
-	@${INSTALL_DATA} ${WRKSRC}/gfax.png ${PREFIX}/share/gnome/pixmaps
-.for pixmaps in ${PIXFILES}
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmaps} ${PREFIX}/lib/gfax/pixmaps
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
+	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} install
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/comms/gfax/distinfo b/comms/gfax/distinfo
index 20103b1..75dc77d 100644
--- a/comms/gfax/distinfo
+++ b/comms/gfax/distinfo
@@ -1,2 +1,2 @@
-MD5 (gfax-0.5.tar.gz) = 58c04251cca3f8ff8ad154fff7d4ebb6
-SIZE (gfax-0.5.tar.gz) = 60083
+MD5 (gfax-0.6.4.tar.gz) = 9ec7185ed012607fa529b5758e02e0d2
+SIZE (gfax-0.6.4.tar.gz) = 150904
diff --git a/comms/gfax/files/patch-Makefile b/comms/gfax/files/patch-Makefile
new file mode 100644
index 0000000..9240bed
--- /dev/null
+++ b/comms/gfax/files/patch-Makefile
@@ -0,0 +1,95 @@
+--- Makefile.orig	Wed Jun 30 15:27:25 2004
++++ Makefile	Fri Jul  9 01:14:53 2004
+@@ -1,4 +1,4 @@
+-export MONO_PATH=/usr/lib/mono:/usr/lib/mono/gtk-sharp
++export MONO_PATH=${LOCALBASE}/lib/mono:${LOCALBASE}/lib/mono/gtk-sharp
+ 
+ MCS = mcs /define:DEBUG
+ #MCS = mcs /define:DEBUGHYLAFAX
+@@ -11,7 +11,6 @@
+ 		/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
+ SOURCES = 	src/phonebook.cs \
+@@ -22,7 +21,7 @@
+ 			src/fax.cs \
+ 			src/hylafax.cs \
+ 			src/Settings.cs
+-			
++
+ DATE=`date +%y-%m-%d`
+ 
+ all: mono-gfax.exe
+@@ -31,37 +30,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
new file mode 100644
index 0000000..c0d4fcc
--- /dev/null
+++ b/comms/gfax/files/patch-gfax
@@ -0,0 +1,31 @@
+--- gfax.orig	Thu Jul  8 22:56:38 2004
++++ gfax	Thu Jul  8 23:48:36 2004
+@@ -11,24 +11,20 @@
+ #  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
++RNAME=`mktemp -q $SPOOL_DIR/D.XXXXXX` || exit 1
+ MYPATH=/usr/bin
+ STD=no
+ 
+ if [ -s /dev/stdin ]; then
+-	cat > $SPOOL_DIR/D.$RNAME
++	cat > $RNAME
+ 	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
+-	#rm -f $SPOOL_DIR/D.$RNAME
++	mono $MYPATH/mono-gfax.exe -f $RNAME
++	#rm -f $RNAME
+ 	exit 0
+ fi
+ 
diff --git a/comms/gfax/files/patch-gfaxlpr b/comms/gfax/files/patch-gfaxlpr
new file mode 100644
index 0000000..94cfc7f
--- /dev/null
+++ b/comms/gfax/files/patch-gfaxlpr
@@ -0,0 +1,16 @@
+--- gfaxlpr.orig	Thu Jul  8 23:11:51 2004
++++ gfaxlpr	Thu Jul  8 23:50:40 2004
+@@ -11,10 +11,10 @@
+ #  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
++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
++cat > $RNAME
++mono $MYPATH/mono-gfax.exe -f $RNAME
diff --git a/comms/gfax/files/patch-scripts_printer-setup.sh b/comms/gfax/files/patch-scripts_printer-setup.sh
new file mode 100644
index 0000000..c379692
--- /dev/null
+++ b/comms/gfax/files/patch-scripts_printer-setup.sh
@@ -0,0 +1,39 @@
+--- scripts/printer-setup.sh.orig	Thu Jul  8 23:54:42 2004
++++ scripts/printer-setup.sh	Fri Jul  9 00:05:00 2004
+@@ -7,15 +7,15 @@
+ # Install all the printer profiles
+ if [ $1 == "--install" ]; then
+ 	# Install GNOME-1.x printer files.
+-	if [ -d /usr/share/gnome-print ]; then
+-		cp -f /usr/share/gfax/fax-g3.profile /usr/share/gnome-print/profiles
++	if [ -d /usr/share/gnome/gnome-print ]; then
++		cp -f /usr/share/gnome/gfax/fax-g3.profile /usr/share/gnome/gnome-print/profiles
+ 	fi
+ 
+ 	# Install GNOME-2.x printer files.
+-	for i in /usr/share/libgnomeprint/*
++	for i in /usr/share/gnome/libgnomeprint/*
+ 	do
+-		cp -f /usr/share/gfax/GFAX.xml $i/printers
+-		cp -f /usr/share/gfax/GNOME-GFAX-PS.xml $i/models
++		cp -f /usr/share/gnome/gfax/GFAX.xml $i/printers
++		cp -f /usr/share/gnome/gfax/GNOME-GFAX-PS.xml $i/models
+ 	done
+ fi
+ 
+@@ -23,12 +23,12 @@
+ # Remove all the printer profiles
+ if [ $1 == "--remove" ]; then
+ 	# Remove GNOME-1.x printer files.
+-	if [ -d /usr/share/gnome-print ]; then
+-		rm -f /usr/share/gnome-print/profiles/fax-g3.profile
++	if [ -d /usr/share/gnome/gnome-print ]; then
++		rm -f /usr/share/gnome/gnome-print/profiles/fax-g3.profile
+ 	fi
+ 
+ 	# Remove GNOME-2.x printer files.
+-	for i in /usr/share/libgnomeprint/*
++	for i in /usr/share/gnome/libgnomeprint/*
+ 	do
+ 		rm -f $i/printers/GFAX.xml
+ 		rm -f $i/models/GNOME-GFAX-PS.xml
diff --git a/comms/gfax/pkg-plist b/comms/gfax/pkg-plist
index 3f7cd17..fe1a961 100644
--- a/comms/gfax/pkg-plist
+++ b/comms/gfax/pkg-plist
@@ -1,38 +1,15 @@
+@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
-lib/gfax/controller.py
-lib/gfax/en.h
-lib/gfax/fax-g3.profile
-lib/gfax/fax.py
-lib/gfax/file_handler.py
-lib/gfax/gfax.desktop
-lib/gfax/gfax.glade
-lib/gfax/gfax.png
-lib/gfax/gfax.py
-lib/gfax/gfax.spec
-lib/gfax/hfaxlib.py
-lib/gfax/install.sh
-lib/gfax/mgettydruid.glade
-lib/gfax/pixmaps/gfax.png
-lib/gfax/pixmaps/gnome-logo-icon-transparent.png
-lib/gfax/prefs.py
-lib/gfax/prefs_ui.py
-lib/gfax/setup.glade
-lib/gfax/ui.py
-lib/gfax/uninstall.sh
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/apps/Applications/gfax.desktop
-share/gnome/ximian/Programs/Utilities/gfax.desktop
-@dirrm share/gnome/ximian/Programs/Utilities
-@dirrm share/gnome/ximian/Programs
-@dirrm share/gnome/ximian
-@dirrm share/gnome/apps/Applications
-@dirrm share/gnome/apps
-@dirrm share/gnome
-%%PORTDOCS%%%%DOCSDIR%%
-@dirrm lib/gfax/pixmaps
-@dirrm lib/gfax
+bin/gfaxlpr
+bin/mono-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/pixmaps/gfax.png
+@dirrm share/gnome/gfax