diff options
| author | pawel <pawel@FreeBSD.org> | 2014-05-19 03:11:05 +0800 |
|---|---|---|
| committer | pawel <pawel@FreeBSD.org> | 2014-05-19 03:11:05 +0800 |
| commit | 2ca80ed10addb5de0bed3f9dfd7a4b9673167e4e (patch) | |
| tree | 1553b2400b2ebeebff2c6296da61857380ec269a /japanese | |
| parent | 11f6adee1c219667bef15ef236ff12443f4c324f (diff) | |
| download | freebsd-ports-gnome-2ca80ed10addb5de0bed3f9dfd7a4b9673167e4e.tar.gz freebsd-ports-gnome-2ca80ed10addb5de0bed3f9dfd7a4b9673167e4e.tar.zst freebsd-ports-gnome-2ca80ed10addb5de0bed3f9dfd7a4b9673167e4e.zip | |
- Fix build with clang
- Add staging support
MFH: 2014Q2
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/namazu/Makefile | 4 | ||||
| -rw-r--r-- | japanese/namazu/files/patch-Makefile.in | 58 | ||||
| -rw-r--r-- | japanese/namazu/files/patch-aa | 12 | ||||
| -rw-r--r-- | japanese/namazu/files/patch-codeconv.c | 10 | ||||
| -rw-r--r-- | japanese/namazu/files/patch-configure | 11 |
5 files changed, 82 insertions, 13 deletions
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile index 8b5ac5d24026..97fd03668376 100644 --- a/japanese/namazu/Makefile +++ b/japanese/namazu/Makefile @@ -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> diff --git a/japanese/namazu/files/patch-Makefile.in b/japanese/namazu/files/patch-Makefile.in new file mode 100644 index 000000000000..8340f6f7d107 --- /dev/null +++ b/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 diff --git a/japanese/namazu/files/patch-aa b/japanese/namazu/files/patch-aa deleted file mode 100644 index f0a43676f9bc..000000000000 --- a/japanese/namazu/files/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -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 -@@ -1702,6 +1702,8 @@ - fi - if test "$CHASEN" != "not_found"; then - WAKATI_DEFAULT=CHASEN -+ else -+ CHASEN=/usr/local/bin/chasen - fi - - fi diff --git a/japanese/namazu/files/patch-codeconv.c b/japanese/namazu/files/patch-codeconv.c new file mode 100644 index 000000000000..b475b7abebed --- /dev/null +++ b/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; diff --git a/japanese/namazu/files/patch-configure b/japanese/namazu/files/patch-configure new file mode 100644 index 000000000000..89af67ef277b --- /dev/null +++ b/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 |