From b9051ca471dd843b41bc7b97688496dc58835cd3 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 1 Jun 2003 20:21:43 +0000 Subject: Update to 0.5 (latest STABLE version), and unbreak now that the system lpr is left untouched. PR: 52780 Submitted by: maintainer --- comms/gfax/Makefile | 76 ++++++++++++++++++--------------- comms/gfax/distinfo | 2 +- comms/gfax/files/patch-gfax.install-lpr | 14 ------ comms/gfax/files/patch-lpr.gfax | 13 ------ comms/gfax/files/patch-src_Makefile.in | 11 ----- comms/gfax/pkg-descr | 3 +- comms/gfax/pkg-plist | 53 +++++++++++++++-------- 7 files changed, 79 insertions(+), 93 deletions(-) delete mode 100644 comms/gfax/files/patch-gfax.install-lpr delete mode 100644 comms/gfax/files/patch-lpr.gfax delete mode 100644 comms/gfax/files/patch-src_Makefile.in (limited to 'comms') diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile index d1aceeb3c6f2..0261d749f84b 100644 --- a/comms/gfax/Makefile +++ b/comms/gfax/Makefile @@ -6,52 +6,58 @@ # PORTNAME= gfax -PORTVERSION= 0.4.2 +PORTVERSION= 0.5 CATEGORIES= comms print -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4 -DIST_SUBDIR= gnome +MASTER_SITES= http://gfax.cowlug.org/ MAINTAINER= coop9211@uidaho.edu COMMENT= A GNOME pop-up fax manager -BROKEN= "Replaces system lpr binary" - -BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \ ${LOCALBASE}/bin/sendfax:${PORTSDIR}/comms/hylafax -RUN_DEPENDS= ${LOCALBASE}/bin/sendfax:${PORTSDIR}/comms/hylafax -USE_GMAKE= yes +USE_PYTHON= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack libpanel libcapplet libglade -GNU_CONFIGURE= yes +NO_BUILD= yes + +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 -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" +PIXFILES= gfax.png gnome-logo-icon-transparent.png +DOCFILES= AUTHORS COPYING Changelog HACKING INSTALL TODO post-extract: - @${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh - @${LN} -sf ${LOCALBASE}/share/automake/missing ${WRKSRC}/missing - @${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs - -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' \ - ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g' - -pre-install: - @${MV} ${WRKSRC}/gfax.install-lpr ${WRKSRC}/gfax.install-lpr.orig - @${SED} \ - -e 's#%%PREFIX%%#${PREFIX}/#' \ - ${WRKSRC}/gfax.install-lpr.orig > ${WRKSRC}/gfax.install-lpr - @${MV} ${WRKSRC}/lpr.gfax ${WRKSRC}/lpr.gfax.orig - @${SED} \ - -e 's#%%PREFIX%%#${PREFIX}/#' \ - ${WRKSRC}/lpr.gfax.orig > ${WRKSRC}/lpr.gfax - -post-install: - @${SH} ${PREFIX}/bin/gfax.install-lpr + @${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 + +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 .include diff --git a/comms/gfax/distinfo b/comms/gfax/distinfo index a53d052f24a7..184db7b3f7a1 100644 --- a/comms/gfax/distinfo +++ b/comms/gfax/distinfo @@ -1 +1 @@ -MD5 (gnome/gfax-0.4.2.tar.gz) = 815523780287a97133e85585f0319a20 +MD5 (gfax-0.5.tar.gz) = 58c04251cca3f8ff8ad154fff7d4ebb6 diff --git a/comms/gfax/files/patch-gfax.install-lpr b/comms/gfax/files/patch-gfax.install-lpr deleted file mode 100644 index 2895bfb0eb45..000000000000 --- a/comms/gfax/files/patch-gfax.install-lpr +++ /dev/null @@ -1,14 +0,0 @@ ---- gfax.install-lpr Sun Dec 12 10:47:19 1999 -+++ gfax.install-lpr.new Sun Jan 20 21:17:31 2002 -@@ -10,9 +10,10 @@ - # - BINDIR=/usr/bin - LPRBINDIR=/usr/bin -+PREFIX=%%PREFIX%%/bin - - if [ ! -x $LPRBINDIR/lpr.dist ]; then - mv $LPRBINDIR/lpr $LPRBINDIR/lpr.dist -- ln -s $BINDIR/lpr.gfax $BINDIR/lpr -+ ln -s $PREFIX/lpr.gfax $BINDIR/lpr - chmod +x $BINDIR/lpr - fi diff --git a/comms/gfax/files/patch-lpr.gfax b/comms/gfax/files/patch-lpr.gfax deleted file mode 100644 index c638a7bd44d0..000000000000 --- a/comms/gfax/files/patch-lpr.gfax +++ /dev/null @@ -1,13 +0,0 @@ ---- lpr.gfax Sun Dec 12 10:47:16 1999 -+++ lpr.gfax.new Sun Jan 20 21:38:07 2002 -@@ -29,8 +29,9 @@ - FAX= - SPOOL_DIR=/tmp - --BINDIR=/usr/bin -+#BINDIR=/usr/bin - #BINDIR=/usr/local/bin -+BINDIR=%%PREFIX%%/bin - - for i in $* - do diff --git a/comms/gfax/files/patch-src_Makefile.in b/comms/gfax/files/patch-src_Makefile.in deleted file mode 100644 index 472423e6de9c..000000000000 --- a/comms/gfax/files/patch-src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Thu Nov 21 21:50:20 2002 -+++ src/Makefile.in Thu Nov 21 21:50:42 2002 -@@ -109,7 +109,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/ftplib-3.1/linux -DGLADEDIR=\""$(gladedir)"\" -DGFAX_DATADIR=\""$(pkgdatadir)"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/ftplib-3.1/linux -DGLADEDIR=\""$(gladedir)"\" -DGFAX_DATADIR=\""$(pkgdatadir)"\" $(GNOME_INCLUDEDIR) `gnome-config --cflags libglade` - - - bin_PROGRAMS = gfax diff --git a/comms/gfax/pkg-descr b/comms/gfax/pkg-descr index 2081e40b7525..4329c4a342ae 100644 --- a/comms/gfax/pkg-descr +++ b/comms/gfax/pkg-descr @@ -1,5 +1,4 @@ GFax is a front end fax program that performs as the familiar pop-up fax -manager when one prints to a fax printer. GFax works with all X programs -that use lpr as the printer interface--even the command line. +manager when one prints to a fax printer. WWW: http://www.cowlug.org/gfax/ diff --git a/comms/gfax/pkg-plist b/comms/gfax/pkg-plist index 742a7dfafba8..f4fa1b403872 100644 --- a/comms/gfax/pkg-plist +++ b/comms/gfax/pkg-plist @@ -1,19 +1,38 @@ bin/gfax -bin/lpr.gfax -bin/gfax.install-lpr -bin/gfax.uninstall-lpr +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%%share/doc/gfax/AUTHORS +%%PORTDOCS%%share/doc/gfax/COPYING +%%PORTDOCS%%share/doc/gfax/Changelog +%%PORTDOCS%%share/doc/gfax/HACKING +%%PORTDOCS%%share/doc/gfax/INSTALL +%%PORTDOCS%%share/doc/gfax/TODO share/gnome/apps/Applications/gfax.desktop -share/gnome/gfax/glade/gfax.glade -share/gnome/gfax/glade/setup.glade -share/gnome/gfax/glade/mgettydruid.glade -share/gnome/gfax/glade/spool.glade -share/gnome/help/gfax/C/gfax.html -share/gnome/help/gfax/C/topic.dat -share/gnome/help/gfax/C/index.html -share/gnome/pixmaps/gfax.png -@unexec /bin/sh %D/bin/gfax.uninstall-lpr -@exec /bin/sh %D/bin/gfax.install-lpr -@dirrm share/gnome/gfax/glade -@dirrm share/gnome/gfax -@dirrm share/gnome/help/gfax/C -@dirrm share/gnome/help/gfax +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%%share/doc/gfax +@dirrm lib/gfax/pixmaps +@dirrm lib/gfax -- cgit