svn commit: r354449 - in head/japanese/namazu: . files

[Pawel Pekala]

Author: pawel
Date: Sun May 18 19:11:05 2014
New Revision: 354449
URL: http://svnweb.freebsd.org/changeset/ports/354449
QAT: https://qat.redports.org/buildarchive/r354449/

Log:
  - Fix build with clang
  - Add staging support
  
  MFH:		2014Q2

Added:
  head/japanese/namazu/files/patch-Makefile.in   (contents, props changed)
  head/japanese/namazu/files/patch-codeconv.c   (contents, props changed)
  head/japanese/namazu/files/patch-configure
     - copied, changed from r354445, head/japanese/namazu/files/patch-aa
Deleted:
  head/japanese/namazu/files/patch-aa
Modified:
  head/japanese/namazu/Makefile

Modified: head/japanese/namazu/Makefile
==============================================================================
--- head/japanese/namazu/Makefile	Sun May 18 19:01:19 2014	(r354448)
+++ head/japanese/namazu/Makefile	Sun May 18 19:11:05 2014	(r354449)
@@ -21,5 +21,7 @@ GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-NO_STAGE=	yes
+post-patch:
+	@${REINPLACE_CMD} '/^int main/ s|uchar|char|' ${WRKSRC}/namazu.c
+
 .include <bsd.port.mk>

Added: head/japanese/namazu/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/namazu/files/patch-Makefile.in	Sun May 18 19:11:05 2014	(r354449)
@@ -0,0 +1,58 @@
+--- ./Makefile.in.orig	2000-01-26 14:38:51.000000000 +0100
++++ ./Makefile.in	2014-05-18 20:50:57.000000000 +0200
+@@ -292,34 +292,34 @@
+ 	cp namazu.cgi $(CGIDIR)
+ 
+ install: all
+-	if [ ! -d $(BINDIR) ]; then \
+-	    mkdir -p $(BINDIR); \
++	if [ ! -d $(DESTDIR)$(BINDIR) ]; then \
++	    mkdir -p $(DESTDIR)$(BINDIR); \
+ 	fi
+-	if [ ! -d $(INDEXDIR) ]; then \
+-	    mkdir -p $(INDEXDIR); \
++	if [ ! -d $(DESTDIR)$(INDEXDIR) ]; then \
++	    mkdir -p $(DESTDIR)$(INDEXDIR); \
+ 	fi
+-	if [ ! -d "$(DOCDIR)/ja" ]; then \
+-	    mkdir -p "$(DOCDIR)/ja"; \
++	if [ ! -d "$(DESTDIR)$(DOCDIR)/ja" ]; then \
++	    mkdir -p "$(DESTDIR)$(DOCDIR)/ja"; \
+ 	fi
+-	if [ ! -d "$(DOCDIR)/en" ]; then \
+-	    mkdir -p "$(DOCDIR)/en"; \
++	if [ ! -d "$(DESTDIR)$(DOCDIR)/en" ]; then \
++	    mkdir -p "$(DESTDIR)$(DOCDIR)/en"; \
+ 	fi
+-	if [ ! -d $(LIBDIR) ]; then \
+-	    mkdir -p $(LIBDIR); \
++	if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \
++	    mkdir -p $(DESTDIR)$(LIBDIR); \
+ 	fi
+-	if [ ! -d $(CONTRIBDIR) ]; then \
+-	    mkdir -p $(CONTRIBDIR); \
++	if [ ! -d $(DESTDIR)$(CONTRIBDIR) ]; then \
++	    mkdir -p $(DESTDIR)$(CONTRIBDIR); \
+ 	fi
+-	if [ ! -d $(BINDIR_SYS) ]; then \
+-	    mkdir -p $(BINDIR_SYS); \
++	if [ ! -d $(DESTDIR)$(BINDIR_SYS) ]; then \
++	    mkdir -p $(DESTDIR)$(BINDIR_SYS); \
+ 	fi
+-	cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(BINDIR)
+-	cp ../COPYING ../ToDo ../ChangeLog $(DOCDIR)
+-	cp ../README.ja ../doc/ja/* "$(DOCDIR)/ja"
+-	cp ../README.en ../doc/en/* "$(DOCDIR)/en"
+-	cp ../lib/* $(LIBDIR)
+-	cp ../contrib/* $(CONTRIBDIR)
+-	cp namazu mknmz $(BINDIR_SYS)
++	cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(DESTDIR)$(BINDIR)
++	cp ../COPYING ../ToDo ../ChangeLog $(DESTDIR)$(DOCDIR)
++	cp ../README.ja ../doc/ja/* "$(DESTDIR)$(DOCDIR)/ja"
++	cp ../README.en ../doc/en/* "$(DESTDIR)$(DOCDIR)/en"
++	cp ../lib/* $(DESTDIR)$(LIBDIR)
++	cp ../contrib/* $(DESTDIR)$(CONTRIBDIR)
++	cp namazu mknmz $(DESTDIR)$(BINDIR_SYS)
+ 
+ clean:
+ 	$(RM) $(TARGET) *.o config.cache config.log config.status

Added: head/japanese/namazu/files/patch-codeconv.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/namazu/files/patch-codeconv.c	Sun May 18 19:11:05 2014	(r354449)
@@ -0,0 +1,10 @@
+--- ./codeconv.c.orig	2000-01-26 14:38:51.000000000 +0100
++++ ./codeconv.c	2014-05-18 20:48:26.000000000 +0200
+@@ -31,6 +31,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "namazu.h"
+ 
+ uchar kanji2nd;

Copied and modified: head/japanese/namazu/files/patch-configure (from r354445, head/japanese/namazu/files/patch-aa)
==============================================================================
--- head/japanese/namazu/files/patch-aa	Sun May 18 18:13:32 2014	(r354445, copy source)
+++ head/japanese/namazu/files/patch-configure	Sun May 18 19:11:05 2014	(r354449)
@@ -1,6 +1,5 @@
-diff -ur ./namazu-1.3.0.11/src/configure ./configure
---- ./namazu-1.3.0.11/src/configure.orig	Mon Jun 14 22:51:48 1999
-+++ ./configure	Wed Dec  1 01:06:29 1999
+--- ./configure.orig	2000-01-26 14:38:51.000000000 +0100
++++ ./configure	2014-05-18 20:48:26.000000000 +0200
 @@ -1702,6 +1702,8 @@
      fi
      if test "$CHASEN" != "not_found"; then