Date: Sun, 19 Jan 2014 14:24:50 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340304 - in head/japanese/ebview: . files Message-ID: <201401191424.s0JEOoLX045555@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sun Jan 19 14:24:49 2014 New Revision: 340304 URL: http://svnweb.freebsd.org/changeset/ports/340304 QAT: https://qat.redports.org/buildarchive/r340304/ Log: - Fix build with clang - Add License PR: 185708 Submitted by: ports fury Added: head/japanese/ebview/files/patch-data__Makefile.in (contents, props changed) head/japanese/ebview/files/patch-help__Makefile.in (contents, props changed) head/japanese/ebview/files/patch-po__Makefile.in.in (contents, props changed) Modified: head/japanese/ebview/Makefile (contents, props changed) Modified: head/japanese/ebview/Makefile ============================================================================== --- head/japanese/ebview/Makefile Sun Jan 19 14:23:36 2014 (r340303) +++ head/japanese/ebview/Makefile Sun Jan 19 14:24:49 2014 (r340304) @@ -9,12 +9,16 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Electronic Book Viewer -LIB_DEPENDS= eb:${PORTSDIR}/japanese/eb +LICENSE= GPLv2 # (or later) -CONFLICTS= ja-ebview-gtk2-* +LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb +OPTIONS_DEFINE= DOCS + +CONFLICTS= ja-ebview-gtk2-[0-9]* + +USES= gettext gmake USE_GNOME= imlib -USE_GMAKE= yes USE_AUTOTOOLS= autoconf MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" @@ -22,21 +26,16 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="$ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -pre-build: -.for file in src/dictheading.c - cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \ - && iconv -c -t ascii ${file}.pre_iconv > ${file} || ${TRUE} -.endfor +post-patch: + @${REINPLACE_CMD} -e \ + 's|// .*||' ${WRKSRC}/src/dictheading.c post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/japanese/ebview/files/patch-data__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/ebview/files/patch-data__Makefile.in Sun Jan 19 14:24:49 2014 (r340304) @@ -0,0 +1,19 @@ +--- data/Makefile.in.orig ++++ data/Makefile.in +@@ -46,13 +46,13 @@ + + install: + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(packagedatadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir); \ + else \ +- $(top_srcdir)/mkinstalldirs $(packagedatadir); \ ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(packagedatadir); \ + fi; \ + data="$(data)"; \ + for file in $$data; do \ +- $(INSTALL_DATA) $(srcdir)/$$file $(packagedatadir)/$$file; \ ++ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(packagedatadir)/$$file; \ + done; \ + + # Define this as empty until I found a useful application. Added: head/japanese/ebview/files/patch-help__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/ebview/files/patch-help__Makefile.in Sun Jan 19 14:24:49 2014 (r340304) @@ -0,0 +1,21 @@ +--- help/Makefile.in.orig ++++ help/Makefile.in +@@ -49,15 +49,15 @@ + dir="$(dir)"; \ + for lang in $$dir; do \ + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(packagedatadir)/help/$$lang; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)/help/$$lang; \ + else \ +- $(top_srcdir)/mkinstalldirs $(packagedatadir)/help/$$lang; \ ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(packagedatadir)/help/$$lang; \ + fi; \ + done; \ + data="$(data)"; \ + for lang in $$dir; do \ + for file in $$data; do \ +- $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(packagedatadir)/help/$$lang/$$file; \ ++ $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)$(packagedatadir)/help/$$lang/$$file; \ + done; \ + done; \ + Added: head/japanese/ebview/files/patch-po__Makefile.in.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/ebview/files/patch-po__Makefile.in.in Sun Jan 19 14:24:49 2014 (r340304) @@ -0,0 +1,52 @@ +--- po/Makefile.in.in.orig ++++ po/Makefile.in.in +@@ -111,9 +111,9 @@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ +@@ -125,27 +125,27 @@ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $$dir; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$$dir; \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \ + fi; \ + if test -r $$cat; then \ +- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ +- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ ++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ ++ echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + else \ +- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ ++ $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ +- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ ++ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ +- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ +- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ ++ $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ ++ echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ +- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ ++ $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ +- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ ++ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401191424.s0JEOoLX045555>