From b12dacd05aa963d4902cb96722ea5d81f2f4fcf9 Mon Sep 17 00:00:00 2001
From: Ying-Chieh Liao <ijliao@FreeBSD.org>
Date: Thu, 7 Nov 2002 18:08:49 +0000
Subject: 1. fix messages 2. use DATADIR and DOCSDIR 3. show messages when
 install

PR:		31013 (1)
Submitted by:	Joseph Mallett <jmallett@xMach.org>, maintainer (1)
---
 security/john/Makefile    | 9 +++++----
 security/john/pkg-message | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'security')

diff --git a/security/john/Makefile b/security/john/Makefile
index b6c9f44d0aaa..5542dc6832b0 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -47,7 +47,7 @@ do-configure:
 		${WRKDIR}/${DISTNAME}/run/john.ini.in > ${WRKDIR}/${DISTNAME}/run/john.ini
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/john
+	@${MKDIR} ${DATADIR}
 	@${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/run/john ${PREFIX}/bin
 	@cd ${PREFIX}/bin ; ${LN} -sf john xtract
 	@cd ${PREFIX}/bin ; ${LN} -sf john unshadow
@@ -57,10 +57,11 @@ do-install:
 		${WRKDIR}/${DISTNAME}/run/digits.chr \
 		${WRKDIR}/${DISTNAME}/run/password.lst \
 		${WRKDIR}/${DISTNAME}/run/john.ini \
-		${PREFIX}/share/john
+		${DATADIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/john
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/john
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/security/john/pkg-message b/security/john/pkg-message
index f8a5a51375a7..fa8b0b78a30f 100644
--- a/security/john/pkg-message
+++ b/security/john/pkg-message
@@ -1,2 +1,2 @@
-Before running John the Ripper, copy <install_path>/share/ucfjohn/john.ini
-to the current directory.
+Before running John the Ripper, copy $LOCALBASE/share/john/john.ini
+to the current directory. By default $LOCALBASE is /usr/local.
-- 
cgit v1.2.3