svn commit: r354475 - in branches/2014Q2/japanese/namazu: . files

[Pawel Pekala]

Author: pawel
Date: Sun May 18 21:51:39 2014
New Revision: 354475
URL: http://svnweb.freebsd.org/changeset/ports/354475
QAT: https://qat.redports.org/buildarchive/r354475/

Log:
  MFH: r354449
  
  - Fix build with clang
  - Add staging support
  
  Approved by:	portmgr (erwin)

Added:
  branches/2014Q2/japanese/namazu/files/patch-Makefile.in
     - copied unchanged from r354449, head/japanese/namazu/files/patch-Makefile.in
  branches/2014Q2/japanese/namazu/files/patch-codeconv.c
     - copied unchanged from r354449, head/japanese/namazu/files/patch-codeconv.c
  branches/2014Q2/japanese/namazu/files/patch-configure
     - copied unchanged from r354449, head/japanese/namazu/files/patch-configure
Deleted:
  branches/2014Q2/japanese/namazu/files/patch-aa
Modified:
  branches/2014Q2/japanese/namazu/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/japanese/namazu/Makefile
==============================================================================
--- branches/2014Q2/japanese/namazu/Makefile	Sun May 18 21:42:00 2014	(r354474)
+++ branches/2014Q2/japanese/namazu/Makefile	Sun May 18 21:51:39 2014	(r354475)
@@ -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>

Copied: branches/2014Q2/japanese/namazu/files/patch-Makefile.in (from r354449, head/japanese/namazu/files/patch-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/japanese/namazu/files/patch-Makefile.in	Sun May 18 21:51:39 2014	(r354475, copy of r354449, head/japanese/namazu/files/patch-Makefile.in)
@@ -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

Copied: branches/2014Q2/japanese/namazu/files/patch-codeconv.c (from r354449, head/japanese/namazu/files/patch-codeconv.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/japanese/namazu/files/patch-codeconv.c	Sun May 18 21:51:39 2014	(r354475, copy of r354449, head/japanese/namazu/files/patch-codeconv.c)
@@ -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: branches/2014Q2/japanese/namazu/files/patch-configure (from r354449, head/japanese/namazu/files/patch-configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/japanese/namazu/files/patch-configure	Sun May 18 21:51:39 2014	(r354475, copy of r354449, head/japanese/namazu/files/patch-configure)
@@ -0,0 +1,11 @@
+--- ./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
+ 	WAKATI_DEFAULT=CHASEN
++    else
++	CHASEN=/usr/local/bin/chasen
+     fi
+     
+ fi