Attachment #116910 for bug #158935

View | Details | Raw Unified | Return to bug 158935
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/print/lpr-wrapper/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= lpr-wrapper	8	PORTNAME= lpr-wrapper
9	PORTVERSION= 0.6	9	PORTVERSION= 0.7
10	PORTREVISION= 5
11	CATEGORIES= print	10	CATEGORIES= print
12	MASTER_SITES= http://www.mathstat.dal.ca/~selinger/lpr-wrapper/download/	11	MASTER_SITES= http://www.mathstat.dal.ca/~selinger/lpr-wrapper/download/
13		12
Lines 29-32 Link Here
29	RUN_DEPENDS+= pstops:${PORTSDIR}/print/psutils-letter	28	RUN_DEPENDS+= pstops:${PORTSDIR}/print/psutils-letter
30	.endif	29	.endif
31		30
		31	PLIST_FILES= bin/lpr-wrapper bin/lpr-wrapper-cups bin/lpr-wrapper-features
		32
32	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/usr/ports/print/lpr-wrapper/distinfo (-2 / +2 lines)
1	SHA256 (lpr-wrapper-0.6.tar.gz) = 829aa2ac41e66074b7b56242bbc4aa05f63d65f8da6419cbb8756907de6144b1	1	SHA256 (lpr-wrapper-0.7.tar.gz) = 72fd4e6ce70eb1510b43d15ff5a84a1c88a69f28335d0672b25e514019e5d3f9
2	SIZE (lpr-wrapper-0.6.tar.gz) = 46394	2	SIZE (lpr-wrapper-0.7.tar.gz) = 67365




--- lpr-wrapper.in.orig	Fri Apr 22 12:01:13 2005
+++ lpr-wrapper.in	Fri Apr 22 12:16:22 2005
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 # lpr-wrapper --- a wrapper around the lpr command, which can handle
 # any-to-postscript conversion, options for duplex and n-up printing,
@@ -103,7 +103,7 @@
 PPDDIR=@datadir@/@PACKAGE@
 
 # global options file
-SYST_CONFIG=/etc/lprrc
+SYST_CONFIG=@prefix@/etc/lprrc
 
 # user's options file
 USER_CONFIG=.lprrc
@@ -488,17 +488,17 @@
 OPTSTRING=o:P:#:K:C:J:T:U:i:1:2:3:4:w:cdfghlnmprstv
 LONGOPTS=help,version,verbose,test,ppd:,tmpdir:
 
-if [ "$HAVE[getopt]" ]; then
-    OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
-    if [ $? != 0 ]; then
-	echo "Try --help for more information" > /dev/stderr
-	exit 1
-    fi
-    eval set -- "$OPTIONS"
-    dopts "$@"
-else
+#if [ "$HAVE[getopt]" ]; then
+#    OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
+#    if [ $? != 0 ]; then
+#	echo "Try --help for more information" > /dev/stderr
+#	exit 1
+#    fi
+#    eval set -- "$OPTIONS"
+#    dopts "$@"
+#else
     dopts $XOPTS "$@"
-fi
+#fi
 
 #if no printer given (as option or through environment), use default
 if [ x"$PRINTER" == x ]; then




--- lpr-wrapper.in.orig	2011-07-15 13:17:49.000000000 +0800
+++ lpr-wrapper.in	2011-07-15 13:18:56.000000000 +0800
@@ -90,7 +90,7 @@
 prefix=@prefix@
 
 # global options file
-SYST_CONFIG=/etc/lprrc
+SYST_CONFIG=@prefix@/etc/lprrc
 
 # user's options file
 USER_CONFIG=.lprrc
@@ -465,17 +465,17 @@
 OPTSTRING=o:P:#:K:C:J:T:U:i:1:2:3:4:w:cdfghlnmprstv
 LONGOPTS=help,version,verbose,test,ppd:,tmpdir:
 
-if [ "$HAVE_getopt" ]; then
-    OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
-    if [ $? != 0 ]; then
-	echo "Try --help for more information" > /dev/stderr
-	exit 1
-    fi
-    eval set -- "$OPTIONS"
-    dopts "$@"
-else
+#if [ "$HAVE_getopt" ]; then
+#    OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
+#    if [ $? != 0 ]; then
+#	echo "Try --help for more information" > /dev/stderr
+#	exit 1
+#    fi
+#    eval set -- "$OPTIONS"
+#    dopts "$@"
+#else
     dopts $XOPTS "$@"
-fi
+#fi
 
 #if no printer given (as option or through environment), use default
 if [ -z "$PRINTER" ]; then

Lines 1-3 Link Here

(-)/usr/ports/print/lpr-wrapper/pkg-plist (-3 lines)
1	bin/lpr-wrapper
2	share/lpr-wrapper/default.ppd
3	@dirrm share/lpr-wrapper

Return to bug 158935

Lines 1-45 Link Here

(-)/usr/ports/print/lpr-wrapper/files/patch-aa (-45 lines)
1	--- lpr-wrapper.in.orig Fri Apr 22 12:01:13 2005
2	+++ lpr-wrapper.in Fri Apr 22 12:16:22 2005
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# lpr-wrapper --- a wrapper around the lpr command, which can handle
8	# any-to-postscript conversion, options for duplex and n-up printing,
9	@@ -103,7 +103,7 @@
10	PPDDIR=@datadir@/@PACKAGE@
11
12	# global options file
13	-SYST_CONFIG=/etc/lprrc
14	+SYST_CONFIG=@prefix@/etc/lprrc
15
16	# user's options file
17	USER_CONFIG=.lprrc
18	@@ -488,17 +488,17 @@
19	OPTSTRING=o:P:#:K:C:J:T:U:i:1:2:3:4:w:cdfghlnmprstv
20	LONGOPTS=help,version,verbose,test,ppd:,tmpdir:
21
22	-if [ "$HAVE[getopt]" ]; then
23	- OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
24	- if [ $? != 0 ]; then
25	- echo "Try --help for more information" > /dev/stderr
26	- exit 1
27	- fi
28	- eval set -- "$OPTIONS"
29	- dopts "$@"
30	-else
31	+#if [ "$HAVE[getopt]" ]; then
32	+# OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
33	+# if [ $? != 0 ]; then
34	+# echo "Try --help for more information" > /dev/stderr
35	+# exit 1
36	+# fi
37	+# eval set -- "$OPTIONS"
38	+# dopts "$@"
39	+#else
40	dopts $XOPTS "$@"
41	-fi
42	+#fi
43
44	#if no printer given (as option or through environment), use default
45	if [ x"$PRINTER" == x ]; then

Line 0 Link Here

(-)/usr/ports/print/lpr-wrapper/files/patch-lpr-wrapper.in (+39 lines)
	1	--- lpr-wrapper.in.orig 2011-07-15 13:17:49.000000000 +0800
	2	+++ lpr-wrapper.in 2011-07-15 13:18:56.000000000 +0800
	3	@@ -90,7 +90,7 @@
	4	prefix=@prefix@
	5
	6	# global options file
	7	-SYST_CONFIG=/etc/lprrc
	8	+SYST_CONFIG=@prefix@/etc/lprrc
	9
	10	# user's options file
	11	USER_CONFIG=.lprrc
	12	@@ -465,17 +465,17 @@
	13	OPTSTRING=o:P:#:K:C:J:T:U:i:1:2:3:4:w:cdfghlnmprstv
	14	LONGOPTS=help,version,verbose,test,ppd:,tmpdir:
	15
	16	-if [ "$HAVE_getopt" ]; then
	17	- OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
	18	- if [ $? != 0 ]; then
	19	- echo "Try --help for more information" > /dev/stderr
	20	- exit 1
	21	- fi
	22	- eval set -- "$OPTIONS"
	23	- dopts "$@"
	24	-else
	25	+#if [ "$HAVE_getopt" ]; then
	26	+# OPTIONS=`getopt -n $NAME -s bash -l $LONGOPTS -o $OPTSTRING -- $XOPTS "$@"`
	27	+# if [ $? != 0 ]; then
	28	+# echo "Try --help for more information" > /dev/stderr
	29	+# exit 1
	30	+# fi
	31	+# eval set -- "$OPTIONS"
	32	+# dopts "$@"
	33	+#else
	34	dopts $XOPTS "$@"
	35	-fi
	36	+#fi
	37
	38	#if no printer given (as option or through environment), use default
	39	if [ -z "$PRINTER" ]; then