Attachment 20233 Details for Bug 35754 – file.diff

[patch] file.diff

file.diff (text/plain), 11.32 KB, created by papowell on 2002-03-11 01:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: papowell

Created: 2002-03-11 01:20:00 UTC

Size: 11.32 KB

patch

obsolete

>diff -uNr /usr/ports/print/ifhp/Makefile ifhp/Makefile
>--- /usr/ports/print/ifhp/Makefile	Sun Apr  9 10:49:58 2000
>+++ ifhp/Makefile	Sun Mar 10 17:02:57 2002
>@@ -1,27 +1,65 @@
>-# New ports collection makefile for:	ifhp
>-# Date created:		27 August 1999
>+# Ports collection makefile for:	ifhp
>+# Date created:		10 Oct 2001
> # Whom:			papowell@astart.com
> #
>-# $FreeBSD: ports/print/ifhp/Makefile,v 1.3 2000/04/09 17:49:58 cpiazza Exp $
>+## $FreeBSD: ports/print/ifhp/Makefile,v 1.3 2000/04/09 17:49:58 cpiazza Exp $
> #
> 
>-PORTNAME=	ifhp
>-PORTVERSION=	3.3.10
>-CATEGORIES=	print
>-MASTER_SITES=	ftp://ftp.astart.com/pub/LPRng/FILTERS/
>+PORTNAME=ifhp
>+PORTVERSION=3.5.6
>+CATEGORIES=	    print
>+MASTER_SITES=	ftp://ftp.lprng.com/pub/%SUBDIR%/ \
>+	ftp://ftp.cise.ufl.edu/pub/mirrors/%SUBDIR%/ \
>+	ftp://ftp.cs.umn.edu/pub/%SUBDIR%/ \
>+	ftp://ftp.informatik.uni-hamburg.de/pub/os/unix/utils/%SUBDIR%/ \
>+	ftp://ftp.uni-paderborn.de/pub/unix/printer/%SUBDIR%/
>+MASTER_SITE_SUBDIR=  LPRng/ifhp
> EXTRACT_SUFX=	.tgz
> 
>-MAINTAINER=	papowell@astart.com
>+MAINTAINER=papowell@astart.com
>+
>+# RUN_DEPENDS=
>+
>+.if defined(PREFIX)
>+  CONFIGURE_ARGS+=  --prefix="${PREFIX}"
>+.endif
>+.if defined(SYSCONFDIR)
>+  CONFIGURE_ARGS+=  --sysconfdir="${SYSCONFDIR}"
>+.endif
> 
>-MAKEFILE=	Makefile.bsd
> HAS_CONFIGURE=	yes
>+GNU_CONFIGURE=	yes
>+INSTALLS_SHLIB=	yes
>+
>+CONFIGURE_ARGS+= \
>+	--with-ldopts="-L${LOCALBASE}/lib" \
>+	--with-ccopts="-I${LOCALBASE}/include"
>+
>+MAN8=ifhp.8 textps.8
> 
>-MAN8=		ifhp.8 textps.8
>+pre-everything::
>+	@${ECHO_MSG} "If you want to replace the default printing system with LPRng, use:"
>+	@${ECHO_MSG} "  make PREFIX=/usr SYSCONFDIR=/etc clean all install"
>+	@if [ "${PREFIX}" = "/usr" -a ! -d /usr/man ] ; then \
>+		${ECHO_MSG} "The man pages will be installed in /usr/man." ; \
>+		${ECHO_MSG} "You should make a symbolic link /usr/share/man from /usr/man"; \
>+		${ECHO_MSG} "   ln -s /usr/share/man /usr/man"; \
>+		${ECHO_MSG} "If you do not, you will retain the old FreeBSD man pages."; \
>+		${ECHO_MSG} "See the hier(7) man page for details of the FreeBSD file system"; \
>+		${ECHO_MSG} "layout.  Configure is not equipped to determine the location of"; \
>+		${ECHO_MSG} 'man pages and defaults to $${PREFIX}/man, which is incorrect for FreeBSD.'; \
>+		exit 1; \
>+	fi
>+	@${ECHO_MSG} "Configuring with '${CONFIGURE_ARGS}'"
> 
> post-install:
>-	${INSTALL} -d -g bin -o bin -m 0555 ${PREFIX}/share/doc/ifhp
> .if !defined(NOPORTSDOCS)
>-	${CP} -r ${WRKSRC}/HOWTO/* ${PREFIX}/share/doc/ifhp;
>+	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}
>+.for ext in html pdf ppt ps txt gif jpg png
>+	@for i in `ls ${WRKSRC}/HOWTO |${GREP} "\.${ext}$$"`; \
>+		do ${INSTALL_DATA} ${WRKSRC}/HOWTO/$$i ${DOCSDIR}; done
>+.endfor
> .endif
>+	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -uNr /usr/ports/print/ifhp/README.html ifhp/README.html
>--- /usr/ports/print/ifhp/README.html	Wed Dec 31 16:00:00 1969
>+++ ifhp/README.html	Sun Mar 10 17:02:57 2002
>@@ -0,0 +1,25 @@
>+<html>
>+<title> The FreeBSD Ports Collection (print/ifhp)</title>
>+<head><h1> The FreeBSD Ports Collection ("print/ifhp")</h1> </head> <hr>
>+<body>
>+
>+<p>You are now in the directory for the port "print/ifhp" (package name "ifhp-3.5.6").
>+
>+<p>This is the one-line description for this port:
>+
>+<p><hr><p>
>+ifhp - A highly configurable print filter for LPRng
>+<p><hr>
>+
>+<p>Please read the file "<a href="pkg-descr">pkg-descr</a>" for a
>+longer description.
>+
>+<p>Go to the <a href="../../README.html">top of the ports tree</a> for
>+a summary on how to use the ports collection.
>+
>+<p><hr><p>
>+<a href="../README.html"> Go up one level</a>
>+|
>+<a href="../../README.html"> Go to top of ports tree</a>
>+</body>
>+</html>
>diff -uNr /usr/ports/print/ifhp/distinfo ifhp/distinfo
>--- /usr/ports/print/ifhp/distinfo	Sun Oct 31 20:07:46 1999
>+++ ifhp/distinfo	Sun Mar 10 17:02:57 2002
>@@ -1 +1 @@
>-MD5 (ifhp-3.3.10.tgz) = e3094c65d4acb3b09d79ee08f489ffff
>+MD5 (ifhp-3.5.6.tgz) = ca54cb1008c9d0cbb2aa767a1a4810fb
>diff -uNr /usr/ports/print/ifhp/files-pkg-message ifhp/files-pkg-message
>--- /usr/ports/print/ifhp/files-pkg-message	Wed Dec 31 16:00:00 1969
>+++ ifhp/files-pkg-message	Sun Mar 10 17:02:57 2002
>@@ -0,0 +1,14 @@
>+The ifhp configuration file is ifhp.conf
>+
>+For further information, have a look at:
>+  DOCSDIR
>+also:
>+  WWW: http://www.lprng.com
>+
>+Commercial support is available from Astart Technologies:
>+
>+Patrick Powell                 Astart Technologies,
>+papowell@astart.com            9475 Chesapeake Drive, Suite D,
>+Network and System             San Diego, CA 92123
>+  Consulting                   858-874-6543 FAX 858-279-8424 
>+URL:  http://www.astart.com
>diff -uNr /usr/ports/print/ifhp/pkg-comment ifhp/pkg-comment
>--- /usr/ports/print/ifhp/pkg-comment	Sun Oct 31 20:07:46 1999
>+++ ifhp/pkg-comment	Sun Mar 10 17:02:57 2002
>@@ -1 +1 @@
>-LPRng print filter for text, PostScript, PCL, HP, Xerox, etc printers
>+IFHP - A highly configurable print filter for LPRng
>diff -uNr /usr/ports/print/ifhp/pkg-descr ifhp/pkg-descr
>--- /usr/ports/print/ifhp/pkg-descr	Sun Oct 31 20:07:46 1999
>+++ ifhp/pkg-descr	Sun Mar 10 17:02:57 2002
>@@ -1,7 +1,8 @@
>-The IFHP print filter is a highly configurable and almost universal
>-print filter for the LPRng print spooler.  It can handle text, PostScript,
>-PCL, and PJL compatible printers, as well as doing synchronization, resetting,
>-getting page counts,  end of job detection and other administrative functions.
>-It will handle HP, Tektronics,  Xerox, Qume, and just about any printer that
>-can accept a connection.  Configuration is done using the /etc/ifhp.conf file
>-which can be tailored for your particular printer.
>+ifhp is a highly versatile print filter for BSD based print spoolers.
>+It can be configured to handle text,  PostScript, PJL, PCL, and
>+raster printers, supports conversion from one format to another,
>+and can be used as a stand-alone print utility.  It is the primary
>+supported print filter for the LPRng print spooler.
>+
>+WWW: http://www.lprng.com
>+FTP: ftp://ftp.lprng.com
>diff -uNr /usr/ports/print/ifhp/pkg-install ifhp/pkg-install
>--- /usr/ports/print/ifhp/pkg-install	Wed Dec 31 16:00:00 1969
>+++ ifhp/pkg-install	Sun Mar 10 17:02:57 2002
>@@ -0,0 +1,98 @@
>+#!/bin/sh
>+PREFIX=/usr
>+SYSCONFDIR=/etc
>+IFHP_CONF=/etc/ifhp.conf
>+MANDIR=/usr/man
>+VERSION=3.5.6
>+#
>+# -- START --
>+# $Id: postinstall.freebsd.sh,v 1.9 2001/12/12 01:54:49 papowell Exp papowell $
>+#
>+#  If you are building a PORT, see the
>+#  DISTRIBUTIONS/Freebsd directory for a complete port
>+#  building package.
>+# 
>+# This is the shell script that does the postinstall
>+# dynamic fixup
>+#  It needs to be massaged with the information for
>+#  various paths.
>+# If you are building a package,  then you do NOT want
>+#  to have this executed - it will put the sample files
>+#  in place.  You need to do this during the postinstall
>+#  step in the package installation.
>+#
>+echo RUNNING postinstall.freebsd.sh MAKEPACKAGE="$MAKEPACKAGE" MAKEINSTALL="$MAKEINSTALL" PREFIX="$PREFIX" cwd `pwd`
>+if [ "$VERBOSE_INSTALL" != "" ] ; then set -x; fi
>+fix () {
>+	v=`echo $1 | sed -e 's/[:;].*//'`;
>+    p=`echo $2 | sed -e 's/:.*//'`; d=`dirname $p`;
>+	if expr "$p" : "\|" >/dev/null ; then
>+		echo "$v is a filter '$p'" 
>+		exit 0
>+	fi
>+    echo "Putting $p in $d, using $v.sample"
>+	if [ ! -d "$d" ] ; then
>+		echo "Directory $d does not exist!"
>+		mkdir -p $d
>+	fi
>+	if [ -f $v.sample ] ; then
>+		if [ $v.sample != $p.sample ] ; then cp $v.sample $p.sample; fi
>+	elif [ -f $v ] ; then
>+		if [ $v != $p.sample ] ; then cp $v $p.sample; fi
>+	else
>+		echo "Do not have $v.sample or $v"
>+	fi
>+	if [ ! -f $p.sample ] ; then
>+		echo "Do not have $p.sample"
>+	else
>+		if [ -f $p ] ; then
>+			date=`date | awk '{ print $6, $2, $3, $4;}' | sed -e 's/  */_/g' `
>+			echo "Saving $p in $p.$date"
>+			mv $p $p.$date
>+		fi
>+		chmod 644 $p.sample
>+		cp $p.sample $p;
>+		chmod 644 $p;
>+	fi;
>+}
>+# we use the /usr/local/etc/rc.d method to start
>+# lpd
>+# we have to take them from one place and put in another
>+if [ "X$MAKEPACKAGE" = "XYES" ] ; then
>+	hold=${DESTDIR}${PREFIX}/etc
>+	echo "Setting up configuration files path for package creation" ${hold}
>+    if [ ! -d ${hold} ] ; then mkdir -p ${hold} ; fi;
>+    cp ifhp.conf ${hold}/ifhp.conf.sample
>+elif [ X$MAKEINSTALL = XYES ] ; then
>+	# we have the port pre-install operation
>+	if [ "$MANDIR" = "/usr/man" -a ! -d ${DESTDIR}/usr/man ] ; then
>+		# we have the dreaded standard installation
>+		# try to make a symbolic link to 
>+		echo "Creating symbolic link from /usr/man to /usr/share/man"
>+		v=`ln -s ${DESTDIR}/usr/share/man ${DESTDIR}/usr/man`;
>+	fi
>+	hold=${DESTDIR}${PREFIX}/etc
>+	echo "Setting up configuration files path for installation" ${hold}
>+    if [ ! -d ${hold} ] ; then mkdir -p ${hold} ; fi;
>+    cp ifhp.conf ${hold}/ifhp.conf.sample
>+    fix ifhp.conf "${DESTDIR}${IFHP_CONF}"
>+elif [ "X$2" = "XPOST-INSTALL" ] ; then
>+	# when doing an install from a package we get the file from the package
>+	hold=etc
>+    if [ -f ${hold}/ifhp.conf.sample ] ; then
>+        fix ${hold}/ifhp.conf "${IFHP_CONF}"
>+    else
>+        echo "WARNING: configuration files missing from package! CWD " `pwd`
>+		ls
>+		exit 1
>+    fi
>+elif [ "X$2" = "XPRE-INSTALL" ] ; then
>+	# we have the port pre-install operation
>+	if [ "$MANDIR" = "/usr/man" -a ! -d /usr/man ] ; then
>+		# we have the dreaded standard installation
>+		# try to make a symbolic link to 
>+		echo "Creating symbolic link from /usr/man to /usr/share/man"
>+		v=`ln -s /usr/share/man /usr/man`;
>+	fi
>+fi
>+exit 0
>diff -uNr /usr/ports/print/ifhp/pkg-message ifhp/pkg-message
>--- /usr/ports/print/ifhp/pkg-message	Wed Dec 31 16:00:00 1969
>+++ ifhp/pkg-message	Sun Mar 10 17:02:57 2002
>@@ -0,0 +1,14 @@
>+The ifhp configuration file is ifhp.conf
>+
>+For further information, have a look at:
>+  /usr/share/doc/ifhp
>+also:
>+  WWW: http://www.lprng.com
>+
>+Commercial support is available from Astart Technologies:
>+
>+Patrick Powell                 Astart Technologies,
>+papowell@astart.com            9475 Chesapeake Drive, Suite D,
>+Network and System             San Diego, CA 92123
>+  Consulting                   858-874-6543 FAX 858-279-8424 
>+URL:  http://www.astart.com
>diff -uNr /usr/ports/print/ifhp/pkg-plist ifhp/pkg-plist
>--- /usr/ports/print/ifhp/pkg-plist	Sat Mar 10 16:46:05 2001
>+++ ifhp/pkg-plist	Sun Mar 10 17:02:57 2002
>@@ -1,41 +1,4 @@
>-etc/ifhp.conf
> etc/ifhp.conf.sample
> libexec/filters/ifhp
> libexec/filters/textps
>-libexec/filters/accounting.sh
>-libexec/filters/psbanner.ps
>-libexec/filters/ofhp
>-libexec/filters/banner
>-share/doc/ifhp/IFHP-HOWTO-1.html
>-share/doc/ifhp/options
>-share/doc/ifhp/fixoptions
>-share/doc/ifhp/Makefile.in
>-share/doc/ifhp/Makefile.bsd.in
>-share/doc/ifhp/Makefile.bsd
>-share/doc/ifhp/Makefile
>-share/doc/ifhp/IFHP-HOWTO.txt
>-share/doc/ifhp/IFHP-HOWTO.tex
>-share/doc/ifhp/IFHP-HOWTO.sgml
>-share/doc/ifhp/IFHP-HOWTO.ps
>-share/doc/ifhp/IFHP-HOWTO.info-4
>-share/doc/ifhp/IFHP-HOWTO.info-3
>-share/doc/ifhp/IFHP-HOWTO.info-2
>-share/doc/ifhp/IFHP-HOWTO.info-1
>-share/doc/ifhp/IFHP-HOWTO.info
>-share/doc/ifhp/IFHP-HOWTO.html
>-share/doc/ifhp/IFHP-HOWTO.dvi
>-share/doc/ifhp/IFHP-HOWTO-9.html
>-share/doc/ifhp/IFHP-HOWTO-8.html
>-share/doc/ifhp/IFHP-HOWTO-7.html
>-share/doc/ifhp/IFHP-HOWTO-6.html
>-share/doc/ifhp/IFHP-HOWTO-5.html
>-share/doc/ifhp/IFHP-HOWTO-4.html
>-share/doc/ifhp/IFHP-HOWTO-3.html
>-share/doc/ifhp/IFHP-HOWTO-2.html
>-share/doc/ifhp/IFHP-HOWTO-12.html
>-share/doc/ifhp/IFHP-HOWTO-11.html
>-share/doc/ifhp/IFHP-HOWTO-10.html
>-share/doc/ifhp/dict
>-share/doc/ifhp/updateversion
>-@dirrm libexec/filters
>-@dirrm share/doc/ifhp
>+libexec/filters/wrapper

Actions: View | Diff

Attachments on bug 35754: 20233