Index: branches/2015Q4/comms/efax/Makefile =================================================================== --- branches/2015Q4/comms/efax/Makefile (revision 402606) +++ branches/2015Q4/comms/efax/Makefile (revision 402607) @@ -1,42 +1,45 @@ # Created by: MITA Yoshio # $FreeBSD$ PORTNAME= efax-0.9a PORTVERSION= 001114a7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= comms MASTER_SITES= http://shino.pos.to/linux/ MAINTAINER= ports@FreeBSD.org COMMENT= Fax send/receive program + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS=xloadimage:${PORTSDIR}/x11/xloadimage DOCSDIR= ${PREFIX}/share/doc/efax PORTDOCS= COPYING README printcap.sample efax.html fax.html MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" SUB_FILES= pkg-message CONFLICTS= efax-gtk-* post-patch: ${REINPLACE_CMD} -e 's,$$(PREFIX),${STAGEDIR}&,g' ${WRKSRC}/Makefile post-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/fax OPTIONS_DEFINE= DOCS post-install: ${INSTALL_DATA} ${WRKSRC}/efax.rc.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/efax.rc.sample.ja ${STAGEDIR}${PREFIX}/etc/efax.rc.ja.sample @${MKDIR} ${STAGEDIR}/var/spool/fax/incoming ${TOUCH} ${STAGEDIR}/var/spool/fax/incoming/.keepme @${MKDIR} ${STAGEDIR}/var/spool/fax/outgoing ${TOUCH} ${STAGEDIR}/var/spool/fax/outgoing/lock @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: branches/2015Q4/comms/efax/files/patch-src_Makefile =================================================================== --- branches/2015Q4/comms/efax/files/patch-src_Makefile (revision 402606) +++ branches/2015Q4/comms/efax/files/patch-src_Makefile (nonexistent) @@ -1,41 +0,0 @@ ---- Makefile.orig Wed Jun 28 19:01:22 2000 -+++ Makefile Sun Oct 20 03:06:13 2002 -@@ -3,20 +3,17 @@ - # Change the following to the name of your ANSI C compiler - # (normally gcc). - --CC=gcc -+CC?=cc - - # Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror - # is undefined - --CFLAGS= --LDFLAGS= -- - # Change the following to the destination directories for - # binaries and man pages. Probably /usr/bin and /usr/man on - # Linux, /usr/local/{bin,man} on other systems. - --BINDIR=/usr/bin --MANDIR=/usr/man -+BINDIR=$(PREFIX)/bin -+MANDIR=$(PREFIX)/man - - .c.o: - $(CC) $(CFLAGS) -c $< -@@ -32,11 +29,9 @@ - strip efix - - install: -- cp fax efax efix $(BINDIR) -- chmod 755 $(BINDIR)/fax $(BINDIR)/efax $(BINDIR)/efix -- cp fax.1 efax.1 efix.1 $(MANDIR)/man1 -- chmod 644 $(MANDIR)/man1/fax.1 $(MANDIR)/man1/efax.1 \ -- $(MANDIR)/man1/efix.1 -+ $(INSTALL_PROGRAM) efax efix $(BINDIR) -+ $(INSTALL_SCRIPT) fax $(BINDIR) -+ $(INSTALL_DATA) fax.1 efax.1 efix.1 $(MANDIR)/man1 - - clean: - rm -f efax efix efax.o efix.o efaxlib.o efaxio.o efaxos.o efaxmsg.o Property changes on: branches/2015Q4/comms/efax/files/patch-src_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q4/comms/efax/files/patch-src_fax =================================================================== --- branches/2015Q4/comms/efax/files/patch-src_fax (revision 402606) +++ branches/2015Q4/comms/efax/files/patch-src_fax (nonexistent) @@ -1,73 +0,0 @@ ---- fax.orig Sat May 11 12:39:37 2002 -+++ fax Sat May 11 13:42:33 2002 -@@ -24,7 +24,7 @@ - # - do not put spaces before or after the equal (=) signs. - # - # - variables can also be set on the command line, for example: --# fax DEV=cua0 send file.ps -+# fax DEV=cuaa0 send file.ps - # or in a configuration file (see CONFIGFILES below) - # - -@@ -36,16 +36,16 @@ - EFIX=efix - - # The device to which the fax modem is connected (e.g. ttya for --# /dev/ttya). Use a dial-out (cua) device if available. If -+# /dev/ttya). Use a dial-out (cuaa) device if available. If - # there are links to this device then all programs must use same - # name or the UUCP locking mechanism will fail. For example, if --# /dev/modem is a link to /dev/cua1, then getty, uucp, kermit, --# pppd, dip, etc. must *all* use either /dev/modem or /dev/cua1. -+# /dev/modem is a link to /dev/cuaa1, then getty, uucp, kermit, -+# pppd, dip, etc. must *all* use either /dev/modem or /dev/cuaa1. - - # 19 Aug 2001 changed by Masaki Shinomiya, - # because 'man efax' sais the default is /dev/modem. - DEV=modem --#DEV=cua1 -+#DEV=cuaa1 - - # Your fax number in international format, 20 characters maximum. - # Use only digits, spaces, and the "+" character. -@@ -98,7 +98,8 @@ - # conventions. Protect with single quotes for delayed evaluation. - # Add a leading '#' to the file name to use binary format. - --LOCK='-x /var/lock/LCK..$DEV' # modern systems -+LOCK='-x /var/spool/lock/LCK..$DEV' # FreeBSD -+# LOCK='-x /var/lock/LCK..$DEV' # modern systems - # LOCK='-x /usr/spool/uucp/LCK..$DEV' # older systems - # LOCK='-x /var/lock/LCK..$DEV -x /var/spool/uucp/LCK..$DEV' # both - # LOCK='-x #/usr/spool/uucp/LCK..$DEV' # binary format -@@ -124,7 +125,7 @@ - # out if you don't need to use config files. Warning: any type of - # shell command in these files will be executed. - --CONFIGFILES="/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc" -+CONFIGFILES="%%PREFIX%%/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc" - - # A command that will generate unique names for logs and received - # files. 'date +%m%d%H%M%S' works on most systems. Protect with -@@ -421,9 +422,9 @@ - # efax even if a previous process (e.g. login) has changed it. - # Comment out if you don't need to reset device ownership. - --OWNER=root.tty # typical --MODE=666 # anybody --# MODE=660 # only owner & group -+OWNER=uucp:dialer # typical -+#MODE=666 # anybody -+MODE=660 # only owner & group - - # Regular expression for efax exit codes in log files that will - # *not* be saved. For example, use [145] to ignore exits due to -@@ -1101,7 +1102,7 @@ - - if given no arguments, answers the phone and receives a fax. - -- use VAR=value to set variables (e.g. "fax DEV=cua2 receive") -+ use VAR=value to set variables (e.g. "fax DEV=cuaa2 receive") - - session logs are written to a file with the date/time as the - file name and extension of .log (except for automatic reception). Property changes on: branches/2015Q4/comms/efax/files/patch-src_fax ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q4/comms/efax/files/patch-Makefile =================================================================== --- branches/2015Q4/comms/efax/files/patch-Makefile (nonexistent) +++ branches/2015Q4/comms/efax/files/patch-Makefile (revision 402607) @@ -0,0 +1,41 @@ +--- Makefile.orig 2000-06-29 02:01:22 UTC ++++ Makefile +@@ -3,20 +3,17 @@ + # Change the following to the name of your ANSI C compiler + # (normally gcc). + +-CC=gcc ++CC?=cc + + # Compile/load options. Add -DNO_STRERROR to CFLAGS if _strerror + # is undefined + +-CFLAGS= +-LDFLAGS= +- + # Change the following to the destination directories for + # binaries and man pages. Probably /usr/bin and /usr/man on + # Linux, /usr/local/{bin,man} on other systems. + +-BINDIR=/usr/bin +-MANDIR=/usr/man ++BINDIR=$(PREFIX)/bin ++MANDIR=$(PREFIX)/man + + .c.o: + $(CC) $(CFLAGS) -c $< +@@ -32,11 +29,9 @@ efix: efix.o efaxlib.o efaxmsg.o + strip efix + + install: +- cp fax efax efix $(BINDIR) +- chmod 755 $(BINDIR)/fax $(BINDIR)/efax $(BINDIR)/efix +- cp fax.1 efax.1 efix.1 $(MANDIR)/man1 +- chmod 644 $(MANDIR)/man1/fax.1 $(MANDIR)/man1/efax.1 \ +- $(MANDIR)/man1/efix.1 ++ $(INSTALL_PROGRAM) efax efix $(BINDIR) ++ $(INSTALL_SCRIPT) fax $(BINDIR) ++ $(INSTALL_DATA) fax.1 efax.1 efix.1 $(MANDIR)/man1 + + clean: + rm -f efax efix efax.o efix.o efaxlib.o efaxio.o efaxos.o efaxmsg.o Property changes on: branches/2015Q4/comms/efax/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q4/comms/efax/files/patch-efaxmsg.c =================================================================== --- branches/2015Q4/comms/efax/files/patch-efaxmsg.c (nonexistent) +++ branches/2015Q4/comms/efax/files/patch-efaxmsg.c (revision 402607) @@ -0,0 +1,36 @@ +--- efaxmsg.c.orig 1999-03-20 04:38:20 UTC ++++ efaxmsg.c +@@ -98,9 +98,6 @@ int msg ( char *fmt, ... ) + int err=0, i, flags=0 ; + char *p ; + +- va_list ap ; +- va_start ( ap, fmt ) ; +- + if ( ! init ) { + logfile[0] = stderr ; + logfile[1] = stdout ; +@@ -112,6 +109,9 @@ int msg ( char *fmt, ... ) + + for ( i=0 ; i&2 <