From 1678746924ff7b32c60e519fa067b41a8fac1c90 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Mon, 2 Feb 2004 22:34:28 +0000
Subject: - Fix build: 'expr -- --i18n=1' doesn't work on -STABLE.   Revert to
 'expr --i18n=1' and set EXPR_COMPAT in CONFIGURE_ENV for -CURRENT. - Use
 PLIST_FILES

PR:		ports/62251
Submitted by:	Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
---
 textproc/rotix/Makefile              | 3 +++
 textproc/rotix/files/patch-configure | 9 ---------
 textproc/rotix/pkg-plist             | 2 --
 3 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 textproc/rotix/pkg-plist

(limited to 'textproc/rotix')

diff --git a/textproc/rotix/Makefile b/textproc/rotix/Makefile
index 2bdf1408220f..fa3e3928aad2 100644
--- a/textproc/rotix/Makefile
+++ b/textproc/rotix/Makefile
@@ -21,9 +21,12 @@ USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${PREFIX}/man --i18n=1
+CONFIGURE_ENV=	EXPR_COMPAT=1
 
 MAN1=		rotix.1
 
+PLIST_FILES=	bin/rotix share/locale/nl/LC_MESSAGES/rotix.mo
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%CFLAGS%%,${CFLAGS},; s,%%LOCALBASE%%,${LOCALBASE},;' \
 		${WRKSRC}/Makefile
diff --git a/textproc/rotix/files/patch-configure b/textproc/rotix/files/patch-configure
index 1acf4dcb6ed3..cdea1169990a 100644
--- a/textproc/rotix/files/patch-configure
+++ b/textproc/rotix/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sun Jan 27 13:00:06 2002
 +++ configure	Sun Oct 20 03:32:06 2002
-@@ -17,7 +17,7 @@
- arch=`uname -s`
- 
- while [ -n "$1" ]; do
--	e="`expr "$1" : '--\(.*=.*\)'`"
-+	e="`expr -- "$1" : '--\(.*=.*\)'`"
- 	if [ -z "$e" ]; then
- 		cat<<EOF
- Rotix configure
 @@ -83,9 +83,9 @@
  fi
  
diff --git a/textproc/rotix/pkg-plist b/textproc/rotix/pkg-plist
deleted file mode 100644
index cd6e97ec7842..000000000000
--- a/textproc/rotix/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/rotix
-share/locale/nl/LC_MESSAGES/rotix.mo
-- 
cgit v1.2.3