From 479e1637ff0640686707eca96b987f3df6c9d7ad Mon Sep 17 00:00:00 2001
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Sat, 29 Mar 2008 15:02:25 +0000
Subject: . add a script LINUXBASE/usr/bin/lp which let some linux applications
   [1]   (most notable acroread) to print with default settings; . add
 linux_base-f7 to CONFLICTS; . bump PORTREVISION.

Suggested by:	olli, scf [1]
Reviewed by:	netchild  [1]
---
 emulators/linux_base-f9/Makefile                | 7 ++++++-
 emulators/linux_base-f9/files/lp                | 2 ++
 emulators/linux_base-f9/linux_base-f8/Makefile  | 7 ++++++-
 emulators/linux_base-f9/linux_base-f8/files/lp  | 2 ++
 emulators/linux_base-f9/linux_base-f8/pkg-plist | 1 +
 emulators/linux_base-f9/pkg-plist               | 1 +
 6 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 emulators/linux_base-f9/files/lp
 create mode 100644 emulators/linux_base-f9/linux_base-f8/files/lp

(limited to 'emulators/linux_base-f9')

diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index b0955b238e41..e2d51ccfa4d8 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		f8
 PORTVERSION=		8
+PORTREVISION=		1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
 MASTER_SITE_SUBDIR=	../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Packages \
@@ -96,7 +97,7 @@ SRC_DISTFILES+=	acl-2.2.39-13.fc8.src.rpm \
 ALWAYS_KEEP_DISTFILES=	yes
 .endif
 
-CONFLICTS=		linux_base-gentoo* linux_base-fc4 linux_base-fc6
+CONFLICTS=		linux_base-gentoo* linux_base-fc4 linux_base-fc6 linux_base-f7
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
 USE_LINUX_PREFIX=	yes
@@ -204,6 +205,10 @@ do-install:
 	@${LN} -sf /var/tmp ${PREFIX}/usr/tmp
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
+#
+# Let some linux applications (e.g. print/acroread7) print with default settings
+#
+	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 
 post-install:
 #
diff --git a/emulators/linux_base-f9/files/lp b/emulators/linux_base-f9/files/lp
new file mode 100644
index 000000000000..d1e0b5509eed
--- /dev/null
+++ b/emulators/linux_base-f9/files/lp
@@ -0,0 +1,2 @@
+#!/bin/sh -
+exec /usr/bin/lpr "$@"
diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile
index b0955b238e41..e2d51ccfa4d8 100644
--- a/emulators/linux_base-f9/linux_base-f8/Makefile
+++ b/emulators/linux_base-f9/linux_base-f8/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		f8
 PORTVERSION=		8
+PORTREVISION=		1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
 MASTER_SITE_SUBDIR=	../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Packages \
@@ -96,7 +97,7 @@ SRC_DISTFILES+=	acl-2.2.39-13.fc8.src.rpm \
 ALWAYS_KEEP_DISTFILES=	yes
 .endif
 
-CONFLICTS=		linux_base-gentoo* linux_base-fc4 linux_base-fc6
+CONFLICTS=		linux_base-gentoo* linux_base-fc4 linux_base-fc6 linux_base-f7
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
 USE_LINUX_PREFIX=	yes
@@ -204,6 +205,10 @@ do-install:
 	@${LN} -sf /var/tmp ${PREFIX}/usr/tmp
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
+#
+# Let some linux applications (e.g. print/acroread7) print with default settings
+#
+	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${PREFIX}/usr/bin
 
 post-install:
 #
diff --git a/emulators/linux_base-f9/linux_base-f8/files/lp b/emulators/linux_base-f9/linux_base-f8/files/lp
new file mode 100644
index 000000000000..d1e0b5509eed
--- /dev/null
+++ b/emulators/linux_base-f9/linux_base-f8/files/lp
@@ -0,0 +1,2 @@
+#!/bin/sh -
+exec /usr/bin/lpr "$@"
diff --git a/emulators/linux_base-f9/linux_base-f8/pkg-plist b/emulators/linux_base-f9/linux_base-f8/pkg-plist
index db12f6fa5495..bf8ab8a8eb87 100644
--- a/emulators/linux_base-f9/linux_base-f8/pkg-plist
+++ b/emulators/linux_base-f9/linux_base-f8/pkg-plist
@@ -298,6 +298,7 @@ usr/bin/lddlibc4
 usr/bin/locale
 usr/bin/localedef
 usr/bin/logname
+usr/bin/lp
 usr/bin/lsattr
 usr/bin/md5sum
 usr/bin/mkfifo
diff --git a/emulators/linux_base-f9/pkg-plist b/emulators/linux_base-f9/pkg-plist
index db12f6fa5495..bf8ab8a8eb87 100644
--- a/emulators/linux_base-f9/pkg-plist
+++ b/emulators/linux_base-f9/pkg-plist
@@ -298,6 +298,7 @@ usr/bin/lddlibc4
 usr/bin/locale
 usr/bin/localedef
 usr/bin/logname
+usr/bin/lp
 usr/bin/lsattr
 usr/bin/md5sum
 usr/bin/mkfifo
-- 
cgit v1.2.3