Attachment 8365 Details for Bug 17553 – file.diff

[patch] file.diff

file.diff (text/plain), 4.52 KB, created by Mikhail Teterin on 2000-03-22 18:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2000-03-22 18:10:01 UTC

Size: 4.52 KB

patch

obsolete

>--- rlpr/Makefile	Mon Aug 30 21:45:19 1999
>+++ rlpr/Makefile	Wed Mar 22 12:52:51 2000
>@@ -7,5 +7,6 @@
> 
>-DISTNAME=	rlpr-2.00
>+DISTNAME=	rlpr-2.02
> CATEGORIES=	print net
>-MASTER_SITES=	ftp://sherilyn.ne.mediaone.net/pub/
>+MASTER_SITES=	${MASTER_SITE_SUNSITE}
>+MASTER_SITE_SUBDIR=	system/printing
> 
>@@ -13,19 +14,16 @@
> 
>-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
>+#LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib -lintl"
>-CONFIGURE_ARGS=	--with-catgets
>-
>-RLPRRC=	${WRKSRC}/src/rlprrc.h
>+#CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib -lintl"
>+CONFIGURE_ARGS=	--disable-nls --without-catgets
> 
> post-patch:
>-	@${ECHO_MSG} "Replacing references to /etc/rlprrc to ${PREFIX}/etc/rlprrc"
>-	@test -e ${RLPRRC}.orig || ${MV} ${RLPRRC} ${RLPRRC}.orig && \
>-		${SED} s%/etc/%${PREFIX}/etc/% ${RLPRRC}.orig > ${RLPRRC}
>-	@for man in `${GREP} -l /etc/rlprrc ${WRKSRC}/man/*.[0-9n]`; do \
>-		if test -e $$man.orig; then continue; fi; \
>-		${MV} $$man $$man.orig ; \
>-		${SED} s%/etc/rlprrc%${PREFIX}/etc/rlprrc%g < $$man.orig > \
>-			$$man ; \
>+	# Replacing references to /etc/rlprrc to ${PREFIX}/etc/rlprrc
>+	@for f in ${WRKSRC}/src/rlprrc.h \
>+			`${GREP} -l /etc/rlprrc ${WRKSRC}/man/*.[0-9n]`; do \
>+		if test -e $$f.orig; then continue; fi; \
>+		${MV} $$f $$f.orig ; \
>+		${SED} s%/etc/rlprrc%${PREFIX}/etc/rlprrc%g < $$f.orig > \
>+			$$f ; \
> 	done
>@@ -33,5 +31,5 @@
> post-install:
>-	@${ECHO_MSG} "Making the installed binaries suid,\
>+	# Making the installed binaries suid,\
> 		      for the remote lpds to talk to them"
>-	${CHMOD} u+s ${PREFIX}/bin/rlpq ${PREFIX}/bin/rlpr ${PREFIX}/bin/rlprm
>+	${CHMOD} 4511 ${PREFIX}/bin/rlpq ${PREFIX}/bin/rlpr ${PREFIX}/bin/rlprm
> 
>--- rlpr/files/md5	Mon May 10 21:59:51 1999
>+++ rlpr/files/md5	Wed Mar 22 12:37:30 2000
>@@ -1 +1 @@
>-MD5 (rlpr-2.00.tar.gz) = 09c78b2cbb4e32e841720c6adfb1ed9f
>+MD5 (rlpr-2.02.tar.gz) = ea80a4bcc9d3b4d2c9b94b92d11da387
>--- rlpr/files/md5.orig	Wed Dec 31 19:00:00 1969
>+++ rlpr/files/md5.orig	Wed Mar 22 12:37:30 2000
>@@ -0,0 +1 @@
>+MD5 (rlpr-2.00.tar.gz) = 09c78b2cbb4e32e841720c6adfb1ed9f
>--- rlpr/patches/patch-nointl	Wed Dec 31 19:00:00 1969
>+++ rlpr/patches/patch-nointl	Wed Mar 22 12:37:30 2000
>@@ -0,0 +1,16 @@
>+--- src/Makefile.in	Sat Sep  4 22:29:16 1999
>++++ src/Makefile.in	Tue Mar 21 23:05:50 2000
>+@@ -90,4 +90,4 @@
>+ LDFLAGS		= -L../lib
>+-LIBS		= @INTLLIBS@ -lrlpr
>+-INCLUDES	= -I../intl -I../lib -DLOCALEDIR=\"$(localedir)\"
>++LIBS		= -lrlpr
>++INCLUDES	= -I../lib -DLOCALEDIR=\"$(localedir)\"
>+ 
>+--- Makefile.in	Sat Sep  4 22:29:12 1999
>++++ Makefile.in	Tue Mar 21 23:07:50 2000
>+@@ -89,3 +89,3 @@
>+ EXTRA_DIST = INSTALL.generic $(PACKAGE)-$(VERSION).lsm
>+-SUBDIRS = po intl lib man src
>++SUBDIRS = lib man src
>+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>--- rlpr/patches/patch-nonls	Wed Dec 31 19:00:00 1969
>+++ rlpr/patches/patch-nonls	Wed Mar 22 12:41:51 2000
>@@ -0,0 +1,53 @@
>+--- src/rlpq.c	Mon May  3 21:50:22 1999
>++++ src/rlpq.c	Tue Mar 21 23:29:36 2000
>+@@ -65,4 +66,6 @@
>+     setlocale(LC_ALL, "");
>++#ifdef ENABLE_NLS
>+     bindtextdomain(PACKAGE, LOCALEDIR);
>+     textdomain(PACKAGE);
>++#endif
>+ 
>+--- src/rlpr.c	Sat Sep  4 22:09:36 1999
>++++ src/rlpr.c	Tue Mar 21 23:24:48 2000
>+@@ -79,4 +79,6 @@
>+     setlocale(LC_ALL, "");
>++#ifdef ENABLE_NLS
>+     bindtextdomain(PACKAGE, LOCALEDIR);
>+     textdomain(PACKAGE);
>++#endif
>+ 
>+--- src/rlprd.c	Mon May  3 21:50:29 1999
>++++ src/rlprd.c	Tue Mar 21 23:31:12 2000
>+@@ -75,4 +75,6 @@
>+     setlocale(LC_ALL, "");
>++#ifdef ENABLE_NLS
>+     bindtextdomain(PACKAGE, LOCALEDIR);
>+     textdomain(PACKAGE);
>++#endif
>+ 
>+--- src/rlprm.c	Mon May  3 21:50:22 1999
>++++ src/rlprm.c	Tue Mar 21 23:30:22 2000
>+@@ -63,4 +64,6 @@
>+     setlocale(LC_ALL, "");
>++#ifdef ENABLE_NLS
>+     bindtextdomain(PACKAGE, LOCALEDIR);
>+     textdomain(PACKAGE);
>++#endif
>+ 
>+--- src/intl.h	Mon May  3 21:48:39 1999
>++++ src/intl.h	Wed Mar 22 12:40:02 2000
>+@@ -19,7 +19,14 @@
>+ 
>++#ifdef ENABLE_NLS
>+ #include <libintl.h>
>++#endif
>+ #include <locale.h>
>+ 
>++#ifdef ENABLE_NLS
>+ #define	_(string)	gettext(string)
>+ #define	N_(string)	gettext_noop(string)
>++#else
>++#define _(string)	(string)
>++#define N_(string)	(string)
>++#endif
>+ 
>--- rlpr/pkg/DESCR	Mon May 10 21:59:51 1999
>+++ rlpr/pkg/DESCR	Wed Mar 22 12:48:51 2000
>@@ -17,2 +17,4 @@
> 
>-Will use the installed gettext (see devel/gettext port) or its own.
>+Gettext  (-lintl) is  ripped  out by  this port  because  it adds  bloat
>+without functionality -- there are  no language files supplied with this
>+package yet. May be in future versions.

Actions: View | Diff

Attachments on bug 17553: 8365