- Support CC/CFLAGS/X11BASE properly

- Fix pkg-plist
- Use own do-install target

PR:		24552
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

7 files changed, 69 insertions, 53 deletions

diff --git a/japanese/xklock/Makefile b/japanese/xklock/Makefile
index 775255bc6764..49df1ae5f591 100644
--- a/japanese/xklock/Makefile
+++ b/japanese/xklock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xklock
 PORTVERSION=	2.7.1
+PORTREVISION=	1
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
@@ -25,14 +26,13 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 
 pre-configure:
-	@${MV} ${WRKDIR}/jnames.c ${WRKDIR}/jnames.c.in
-	@${SED} -e "s:/usr/local:${PREFIX}:" ${WRKDIR}/jnames.c.in  \
-		> ${WRKDIR}/jnames.c
-	@${MV} ${WRKDIR}/xklock.h ${WRKDIR}/xklock.h.in
-	@${SED} -e "s:/usr/local:${PREFIX}:" ${WRKDIR}/xklock.h.in  \
-		> ${WRKDIR}/xklock.h
-
-post-install:
-	${TOUCH} ${PREFIX}/lib/jnames
+.for file in jnames.c xklock.h
+	@${PERL} -pi -e "s:%%PREFIX%%:${PREFIX}:" ${WRKSRC}/${file}
+.endfor
+
+do-install:
+	${INSTALL_PROGRAM} -m 4755 ${WRKSRC}/xklock ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/lib/X11/xklock
+	${TOUCH} ${PREFIX}/lib/X11/xklock/jnames
 
 .include <bsd.port.mk>
diff --git a/japanese/xklock/files/patch-01 b/japanese/xklock/files/patch-01
deleted file mode 100644
index 303bad0a6d36..000000000000
--- a/japanese/xklock/files/patch-01
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile-	Sun Apr 20 21:20:12 1997
-+++ Makefile	Mon Apr 21 18:29:49 1997
-@@ -4,9 +4,9 @@
- #
- 
- CC      = cc
--C_FLAG  = -fwritable-strings -DSHADOW -O2  #-DDEBUG -g
-+C_FLAG  = -fwritable-strings -O2 -m486 -I${PREFIX}/include #-DDEBUG -g
- RM_FLAG = -f
--LIB     = -lX11 -lXmu -lshadow -lXpm
-+LIB     = -L${PREFIX}/lib -lX11 -lXmu -lXpm -lcrypt
- EXE     = xklock
- OBJ1    = xklock.o
- OBJ2    = jnames.o
-@@ -18,14 +18,14 @@
- DOC     = xklock.doc readme.doc
- TAR     = xklock.tar
- MAKE    = Makefile Makefile.BE
--BIN_DIR = /usr/X386/bin
-+BIN_DIR = ${PREFIX}/bin
- 
- all:$(EXE)
- 
- $(EXE):$(OBJ)
- 	$(CC) $(C_FLAG) -o $@ $(OBJ) $(LIB)
- 
--$(OBJ1):$(SRC1) $(INC)
-+$(OBJ1):$(SRC1)
- 	$(CC) $(C_FLAG) -c $(SRC1)
- 
- $(OBJ2):$(SRC2)
---- xklock.c-	Mon Apr 21 20:25:29 1997
-+++ xklock.c	Mon Apr 21 20:23:36 1997
-@@ -74,7 +74,7 @@
- #ifdef	SHADOW
- static	struct	spwd	*user_spwd;
- #endif
--static	char	root_password[32], user_password[32];
-+static	char	root_password[_PASSWORD_LEN], user_password[_PASSWORD_LEN];
- static	char	*option_name[] = {
-   "-d",			/*	0	*/
-   "-foreground",	/*	1	*/
diff --git a/japanese/xklock/files/patch-aa b/japanese/xklock/files/patch-aa
new file mode 100644
index 000000000000..69b8d72a15d4
--- /dev/null
+++ b/japanese/xklock/files/patch-aa
@@ -0,0 +1,25 @@
+--- Makefile.orig	Thu Nov  1 18:21:29 1990
++++ Makefile	Tue Jan 23 05:06:16 2001
+@@ -3,10 +3,10 @@
+ #	Makefile
+ #
+ 
+-CC      = cc
+-C_FLAG  = -fwritable-strings -DSHADOW -O2  #-DDEBUG -g
++CC      ?= cc
++C_FLAG  = ${CFLAGS} -I${X11BASE}/include
+ RM_FLAG = -f
+-LIB     = -lX11 -lXmu -lshadow -lXpm
++LIB     = -L${X11BASE}/lib -lX11 -lXmu -lXpm -lcrypt
+ EXE     = xklock
+ OBJ1    = xklock.o
+ OBJ2    = jnames.o
+@@ -25,7 +25,7 @@
+ $(EXE):$(OBJ)
+ 	$(CC) $(C_FLAG) -o $@ $(OBJ) $(LIB)
+ 
+-$(OBJ1):$(SRC1) $(INC)
++$(OBJ1):$(SRC1)
+ 	$(CC) $(C_FLAG) -c $(SRC1)
+ 
+ $(OBJ2):$(SRC2)
diff --git a/japanese/xklock/files/patch-ab b/japanese/xklock/files/patch-ab
new file mode 100644
index 000000000000..915cff6b5dc1
--- /dev/null
+++ b/japanese/xklock/files/patch-ab
@@ -0,0 +1,11 @@
+--- jnames.c.orig	Mon Nov 19 18:26:45 1990
++++ jnames.c	Tue Jan 23 05:09:46 2001
+@@ -18,7 +18,7 @@
+ #include <ctype.h>
+ #include <strings.h>
+ 
+-#define JNAMES	"/usr/local/lib/jnames"
++#define JNAMES	"%%PREFIX%%/lib/X11/xklock/jnames"
+ 
+ static FILE *MYJF = NULL, *PUBJF = NULL;
+ 
diff --git a/japanese/xklock/files/patch-ac b/japanese/xklock/files/patch-ac
new file mode 100644
index 000000000000..0b6095d3abff
--- /dev/null
+++ b/japanese/xklock/files/patch-ac
@@ -0,0 +1,11 @@
+--- xklock.c.orig	Tue Jan 23 04:57:50 2001
++++ xklock.c	Tue Jan 23 04:58:35 2001
+@@ -74,7 +74,7 @@
+ #ifdef	SHADOW
+ static	struct	spwd	*user_spwd;
+ #endif
+-static	char	root_password[32], user_password[32];
++static	char	root_password[_PASSWORD_LEN], user_password[_PASSWORD_LEN];
+ static	char	*option_name[] = {
+   "-d",			/*	0	*/
+   "-foreground",	/*	1	*/
diff --git a/japanese/xklock/files/patch-ad b/japanese/xklock/files/patch-ad
new file mode 100644
index 000000000000..d7e7f56ecafd
--- /dev/null
+++ b/japanese/xklock/files/patch-ad
@@ -0,0 +1,11 @@
+--- xklock.h.orig	Mon Nov 19 11:17:56 1990
++++ xklock.h	Tue Jan 23 05:00:15 2001
+@@ -47,7 +47,7 @@
+ 
+ /*	ｊｎａｍｅｓデータベース	*/
+ 
+-#define JNAMES_DB	"/usr/local/lib/jnames"
++#define JNAMES_DB	"%%PREFIX%%/lib/X11/xklock/jnames"
+ 
+ /*	メッセージ	*/
+ 
diff --git a/japanese/xklock/pkg-plist b/japanese/xklock/pkg-plist
index 820d3ab66d83..808d1c71703f 100644
--- a/japanese/xklock/pkg-plist
+++ b/japanese/xklock/pkg-plist
@@ -1,3 +1,3 @@
 bin/xklock
-@exec touch %D/lib/jnames
-@comment @unexec rm %D/lib/jnames
+lib/X11/xklock/jnames
+@dirrm lib/X11/xklock