* drop -Werror; fixes build with clang

* replace gettext module while here
This commit is contained in:
naddy 2017-04-27 23:03:54 +00:00
parent e4ddc2123b
commit b8db4b8592
3 changed files with 18 additions and 9 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2015/07/18 15:31:17 jasper Exp $
# $OpenBSD: Makefile,v 1.24 2017/04/27 23:03:54 naddy Exp $
COMMENT= logbook program for amateur radio operators
DISTNAME= xlog-2.0.13
REVISION= 0
CATEGORIES= comms hamradio
HOMEPAGE= http://www.nongnu.org/xlog/
@ -15,22 +16,18 @@ MASTER_SITES= http://download.savannah.nongnu.org/releases/xlog/
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gtk-x11-2.0 hamlib m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pthread z
WANTLIB += gtk-x11-2.0 hamlib intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 z
RUN_DEPENDS= devel/desktop-file-utils \
misc/shared-mime-info
LIB_DEPENDS= comms/hamlib \
devel/gettext \
x11/gtk+2
MODULES= devel/gettext
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= UPDATE_DESKTOP_DATABASE=/usr/bin/true
pre-configure:
sed -i 's,.-Wno-unused-but-set-variable,,' \
${WRKSRC}/configure
# Needed for strptime(3); prevents a buttload of patches
perl -pi -e 's,^(#define _XOPEN_SOURCE)$$,\1\n#define _XOPEN_SOURCE_EXTENDED 1,g' \
${WRKSRC}/src/logfile/*.c ${WRKSRC}/src/callbacks_mainwindow_menu.c

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-configure,v 1.1 2017/04/27 23:03:54 naddy Exp $
--- configure.orig Tue Apr 21 22:37:39 2015
+++ configure Fri Apr 28 00:54:50 2017
@@ -4462,9 +4462,6 @@ fi
done
-if test "${ac_cv_c_compiler_gnu}" = "yes"; then
- CFLAGS="${CFLAGS} -Wall -Wno-unused-but-set-variable -Werror"
-fi

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2015/07/15 17:23:31 jasper Exp $
@comment $OpenBSD: PLIST,v 1.8 2017/04/27 23:03:54 naddy Exp $
@bin bin/xlog
@man man/man1/xlog.1
share/applications/xlog.desktop
@ -130,7 +130,6 @@ share/doc/xlog/manual/xlog.png
share/doc/xlog/manual/xlog_manual.css
share/doc/xlog/manual/xlog_user.doxy
share/doc/xlog/manual/xlog_user.txt
share/icons/
share/icons/gnome-mime-text-x-xlog.png
share/icons/xlog-icon.png
share/locale/cs/LC_MESSAGES/xlog.mo