Date: Mon, 13 Jan 2014 03:19:44 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185717: japanese/ebview-gtk2: Fix build with clang Message-ID: <20140113031944.454ca89e1938b84a9cffcdde@yahoo.com> Resent-Message-ID: <201401121840.s0CIeAOI049564@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185717
>Category: ports
>Synopsis: japanese/ebview-gtk2: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 12 18:40:10 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add LICENSE
New file:
files/patch-data__Makefile.in
files/patch-doc__Makefile.in
files/patch-po__Makefile.in.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/japanese/ebview-gtk2/Makefile japanese/ebview-gtk2/Makefile
--- /usr/ports/japanese/ebview-gtk2/Makefile 2013-11-06 21:58:35.000000000 +0900
+++ japanese/ebview-gtk2/Makefile 2014-01-13 00:00:00.000000000 +0900
@@ -10,36 +10,35 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Electronic Book Viewer
-LIB_DEPENDS= eb:${PORTSDIR}/japanese/eb
+LICENSE= GPLv2 # (or later)
-CONFLICTS= ja-ebview-0*
+LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb
-USES= pkgconfig
-USE_GNOME= gtk20
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
+CONFLICTS= ja-ebview-[0-9]*
+
+USES= gettext gmake pkgconfig
+USE_GNOME= gtk20 pangox-compat
USE_CSTD= gnu89
-CONFIGURE_ARGS+=--with-eb-conf=${LOCALBASE}/etc/eb.conf
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-eb-conf=${LOCALBASE}/etc/eb.conf
SUB_FILES= ebview.desktop
-NO_STAGE= yes
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
post-patch:
- @${REINPLACE_CMD} -e \
- 's|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED 1||g' \
${WRKSRC}/src/ebview.c
post-install:
- ${INSTALL_DATA} ${WRKSRC}/pixmaps/ebview.xpm ${PREFIX}/share/pixmaps/
- ${INSTALL_DATA} ${WRKDIR}/${SUB_FILES} ${PREFIX}/share/applications/
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in ChangeLog README
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+ (cd ${WRKDIR} && ${INSTALL_DATA} ${SUB_FILES} \
+ ${STAGEDIR}${DESKTOPDIR})
+ (cd ${WRKSRC}/pixmaps && ${INSTALL_DATA} ebview.xpm \
+ ${STAGEDIR}${PREFIX}/share/pixmaps)
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ChangeLog README
+ (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
.endfor
-.endif
.include <bsd.port.mk>
diff -urN /usr/ports/japanese/ebview-gtk2/files/patch-data__Makefile.in japanese/ebview-gtk2/files/patch-data__Makefile.in
--- /usr/ports/japanese/ebview-gtk2/files/patch-data__Makefile.in 1970-01-01 09:00:00.000000000 +0900
+++ japanese/ebview-gtk2/files/patch-data__Makefile.in 2014-01-13 00:00:00.000000000 +0900
@@ -0,0 +1,19 @@
+--- data/Makefile.in.orig
++++ data/Makefile.in
+@@ -304,13 +304,13 @@
+
+ install:
+ if test -r $(MKINSTALLDIRS); then \
+- $(MKINSTALLDIRS) $(pkgdatadir); \
++ $(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir); \
+ else \
+- $(top_srcdir)/mkinstalldirs $(pkgdatadir); \
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \
+ fi; \
+ data="$(data)"; \
+ for file in $$data; do \
+- $(INSTALL_DATA) $(srcdir)/$$file $(pkgdatadir)/$$file; \
++ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/$$file; \
+ done;
+
+ # Define this as empty until I found a useful application.
diff -urN /usr/ports/japanese/ebview-gtk2/files/patch-doc__Makefile.in japanese/ebview-gtk2/files/patch-doc__Makefile.in
--- /usr/ports/japanese/ebview-gtk2/files/patch-doc__Makefile.in 1970-01-01 09:00:00.000000000 +0900
+++ japanese/ebview-gtk2/files/patch-doc__Makefile.in 2014-01-13 00:00:00.000000000 +0900
@@ -0,0 +1,21 @@
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -308,15 +308,15 @@
+ dir="$(dir)"; \
+ for lang in $$dir; do \
+ if test -r $(MKINSTALLDIRS); then \
+- $(MKINSTALLDIRS) $(pkgdatadir)/help/$$lang; \
++ $(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/help/$$lang; \
+ else \
+- $(top_srcdir)/mkinstalldirs $(pkgdatadir)/help/$$lang; \
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/help/$$lang; \
+ fi; \
+ done; \
+ data="$(data)"; \
+ for lang in $$dir; do \
+ for file in $$data; do \
+- $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(pkgdatadir)/help/$$lang/$$file; \
++ $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)$(pkgdatadir)/help/$$lang/$$file; \
+ done; \
+ done;
+
diff -urN /usr/ports/japanese/ebview-gtk2/files/patch-po__Makefile.in.in japanese/ebview-gtk2/files/patch-po__Makefile.in.in
--- /usr/ports/japanese/ebview-gtk2/files/patch-po__Makefile.in.in 1970-01-01 09:00:00.000000000 +0900
+++ japanese/ebview-gtk2/files/patch-po__Makefile.in.in 2014-01-13 00:00:00.000000000 +0900
@@ -0,0 +1,52 @@
+--- po/Makefile.in.in.orig
++++ po/Makefile.in.in
+@@ -115,9 +115,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 \
+@@ -129,27 +129,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; \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140113031944.454ca89e1938b84a9cffcdde>