- update to xlog-2.0.13

- use a pre-configure target instead of patching most logfile handlers
This commit is contained in:
jasper 2015-07-15 17:23:31 +00:00
parent 29d027b433
commit 3fdc8abb82
6 changed files with 136 additions and 117 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2013/03/11 01:30:27 espie Exp $
# $OpenBSD: Makefile,v 1.22 2015/07/15 17:23:31 jasper Exp $
COMMENT= logbook program for amateur radio operators
DISTNAME= xlog-2.0.5
DISTNAME= xlog-2.0.13
CATEGORIES= comms hamradio
REVISION = 1
HOMEPAGE= http://www.nongnu.org/xlog/
@ -13,12 +12,11 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://download.savannah.nongnu.org/releases/xlog/
WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 hamlib m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs
WANTLIB += xcb xcb-render xcb-shm z
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
RUN_DEPENDS= devel/desktop-file-utils \
misc/shared-mime-info
@ -30,4 +28,11 @@ MODULES= devel/gettext
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= UPDATE_DESKTOP_DATABASE=/usr/bin/true
pre-configure:
perl -pi -e '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
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (xlog-2.0.5.tar.gz) = 2CkDd6y7V9URguURxNEanqEMc/TUVDTaIQ3UpcGxsJ8=
SIZE (xlog-2.0.5.tar.gz) = 11173514
SHA256 (xlog-2.0.13.tar.gz) = 1T2FOLn8Yedh0b2ErQyGbMmlBUC2Y1IeutSd9HnXmKs=
SIZE (xlog-2.0.13.tar.gz) = 11427287

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_callbacks_mainwindow_menu_c,v 1.1 2012/05/20 19:42:25 naddy Exp $
Needed for strptime(3).
--- src/callbacks_mainwindow_menu.c.orig Sun May 20 13:32:07 2012
+++ src/callbacks_mainwindow_menu.c Sun May 20 13:33:14 2012
@@ -25,6 +25,7 @@
*/
#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED 1
#include <time.h>
#include <gtk/gtk.h>

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_logfile_adif_c,v 1.1 2012/05/20 19:42:25 naddy Exp $
Needed for strptime(3).
--- src/logfile/adif.c.orig Sun May 20 13:34:15 2012
+++ src/logfile/adif.c Sun May 20 13:34:34 2012
@@ -25,6 +25,7 @@
*/
#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED 1
#include <time.h>
#include <stdlib.h>

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_logfile_cabrillo_c,v 1.1 2012/05/20 19:42:25 naddy Exp $
Needed for strptime(3).
--- src/logfile/cabrillo.c.orig Sun May 20 13:33:32 2012
+++ src/logfile/cabrillo.c Sun May 20 13:33:56 2012
@@ -30,6 +30,7 @@
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE_EXTENDED 1
#endif
#include <stdlib.h>
#include <string.h>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2011/09/12 14:09:56 jasper Exp $
@comment $OpenBSD: PLIST,v 1.7 2015/07/15 17:23:31 jasper Exp $
@bin bin/xlog
@man man/man1/xlog.1
share/applications/xlog.desktop
@ -11,69 +11,125 @@ share/doc/xlog/TODO
share/doc/xlog/glabels/
share/doc/xlog/glabels/qsllabels.glabels
share/doc/xlog/manual/
share/doc/xlog/manual/img1.png
share/doc/xlog/manual/index.html
share/doc/xlog/manual/manual.css
share/doc/xlog/manual/manual.html
share/doc/xlog/manual/next.png
share/doc/xlog/manual/next_g.png
share/doc/xlog/manual/node1.html
share/doc/xlog/manual/node10.html
share/doc/xlog/manual/node11.html
share/doc/xlog/manual/node12.html
share/doc/xlog/manual/node13.html
share/doc/xlog/manual/node14.html
share/doc/xlog/manual/node15.html
share/doc/xlog/manual/node16.html
share/doc/xlog/manual/node17.html
share/doc/xlog/manual/node18.html
share/doc/xlog/manual/node19.html
share/doc/xlog/manual/node2.html
share/doc/xlog/manual/node20.html
share/doc/xlog/manual/node21.html
share/doc/xlog/manual/node22.html
share/doc/xlog/manual/node23.html
share/doc/xlog/manual/node24.html
share/doc/xlog/manual/node25.html
share/doc/xlog/manual/node26.html
share/doc/xlog/manual/node27.html
share/doc/xlog/manual/node28.html
share/doc/xlog/manual/node29.html
share/doc/xlog/manual/node3.html
share/doc/xlog/manual/node30.html
share/doc/xlog/manual/node31.html
share/doc/xlog/manual/node32.html
share/doc/xlog/manual/node33.html
share/doc/xlog/manual/node34.html
share/doc/xlog/manual/node35.html
share/doc/xlog/manual/node4.html
share/doc/xlog/manual/node5.html
share/doc/xlog/manual/node6.html
share/doc/xlog/manual/node7.html
share/doc/xlog/manual/node8.html
share/doc/xlog/manual/node9.html
share/doc/xlog/manual/prev.png
share/doc/xlog/manual/prev_g.png
share/doc/xlog/manual/up.png
share/doc/xlog/manual/up_g.png
share/doc/xlog/manual/xlog-defaultsdialog.png
share/doc/xlog/manual/xlog-dupecheckdialog.png
share/doc/xlog/manual/xlog-exportsettings.png
share/doc/xlog/manual/xlog-importdialog.png
share/doc/xlog/manual/xlog-keyerwindow.png
share/doc/xlog/manual/xlog-logeditor.png
share/doc/xlog/manual/xlog-mainwindow.png
share/doc/xlog/manual/xlog-mergelogdialog.png
share/doc/xlog/manual/xlog-newlogdialog.png
share/doc/xlog/manual/xlog-pagesetupdialog.png
share/doc/xlog/manual/xlog-preferencesdialog-general.png
share/doc/xlog/manual/xlog-preferencesdialog-hamlib.png
share/doc/xlog/manual/xlog-preferencesdialog-info.png
share/doc/xlog/manual/xlog-preferencesdialog-logs.png
share/doc/xlog/manual/xlog-printdialog.png
share/doc/xlog/manual/xlog-scorewindow.png
share/doc/xlog/manual/xlog-searchdialog.png
share/doc/xlog/manual/xlog-workedwindow.png
share/doc/xlog/manual/README
share/doc/xlog/manual/appendix-bands.dox
share/doc/xlog/manual/appendix-keys.dox
share/doc/xlog/manual/appendix-modes.dox
share/doc/xlog/manual/appendix-prosigns.dox
share/doc/xlog/manual/appendix-qcodes.dox
share/doc/xlog/manual/dialogs-and-windows.dox
share/doc/xlog/manual/getting_started.dox
share/doc/xlog/manual/intro.dox
share/doc/xlog/manual/keyer.dox
share/doc/xlog/manual/license.dox
share/doc/xlog/manual/output/
share/doc/xlog/manual/output/html/
share/doc/xlog/manual/output/html/appendix-bands.html
share/doc/xlog/manual/output/html/appendix-keys.html
share/doc/xlog/manual/output/html/appendix-modes.html
share/doc/xlog/manual/output/html/appendix-prosigns.html
share/doc/xlog/manual/output/html/appendix-qcodes.html
share/doc/xlog/manual/output/html/bc_s.png
share/doc/xlog/manual/output/html/bdwn.png
share/doc/xlog/manual/output/html/closed.png
share/doc/xlog/manual/output/html/dialogs-and-windows.html
share/doc/xlog/manual/output/html/doxygen.css
share/doc/xlog/manual/output/html/doxygen.png
share/doc/xlog/manual/output/html/dynsections.js
share/doc/xlog/manual/output/html/ftv2blank.png
share/doc/xlog/manual/output/html/ftv2cl.png
share/doc/xlog/manual/output/html/ftv2doc.png
share/doc/xlog/manual/output/html/ftv2folderclosed.png
share/doc/xlog/manual/output/html/ftv2folderopen.png
share/doc/xlog/manual/output/html/ftv2lastnode.png
share/doc/xlog/manual/output/html/ftv2link.png
share/doc/xlog/manual/output/html/ftv2mlastnode.png
share/doc/xlog/manual/output/html/ftv2mnode.png
share/doc/xlog/manual/output/html/ftv2mo.png
share/doc/xlog/manual/output/html/ftv2node.png
share/doc/xlog/manual/output/html/ftv2ns.png
share/doc/xlog/manual/output/html/ftv2plastnode.png
share/doc/xlog/manual/output/html/ftv2pnode.png
share/doc/xlog/manual/output/html/ftv2splitbar.png
share/doc/xlog/manual/output/html/ftv2vertline.png
share/doc/xlog/manual/output/html/getting-started.html
share/doc/xlog/manual/output/html/index.html
share/doc/xlog/manual/output/html/jquery.js
share/doc/xlog/manual/output/html/keyer.html
share/doc/xlog/manual/output/html/license.html
share/doc/xlog/manual/output/html/nav_f.png
share/doc/xlog/manual/output/html/nav_g.png
share/doc/xlog/manual/output/html/nav_h.png
share/doc/xlog/manual/output/html/navtree.css
share/doc/xlog/manual/output/html/navtree.js
share/doc/xlog/manual/output/html/navtreeindex0.js
share/doc/xlog/manual/output/html/open.png
share/doc/xlog/manual/output/html/pages.html
share/doc/xlog/manual/output/html/preferences.html
share/doc/xlog/manual/output/html/resize.js
share/doc/xlog/manual/output/html/search/
share/doc/xlog/manual/output/html/search/all_61.html
share/doc/xlog/manual/output/html/search/all_61.js
share/doc/xlog/manual/output/html/search/all_64.html
share/doc/xlog/manual/output/html/search/all_64.js
share/doc/xlog/manual/output/html/search/all_67.html
share/doc/xlog/manual/output/html/search/all_67.js
share/doc/xlog/manual/output/html/search/all_69.html
share/doc/xlog/manual/output/html/search/all_69.js
share/doc/xlog/manual/output/html/search/all_6b.html
share/doc/xlog/manual/output/html/search/all_6b.js
share/doc/xlog/manual/output/html/search/all_6c.html
share/doc/xlog/manual/output/html/search/all_6c.js
share/doc/xlog/manual/output/html/search/all_70.html
share/doc/xlog/manual/output/html/search/all_70.js
share/doc/xlog/manual/output/html/search/close.png
share/doc/xlog/manual/output/html/search/mag_sel.png
share/doc/xlog/manual/output/html/search/nomatches.html
share/doc/xlog/manual/output/html/search/pages_61.html
share/doc/xlog/manual/output/html/search/pages_61.js
share/doc/xlog/manual/output/html/search/pages_64.html
share/doc/xlog/manual/output/html/search/pages_64.js
share/doc/xlog/manual/output/html/search/pages_67.html
share/doc/xlog/manual/output/html/search/pages_67.js
share/doc/xlog/manual/output/html/search/pages_69.html
share/doc/xlog/manual/output/html/search/pages_69.js
share/doc/xlog/manual/output/html/search/pages_6b.html
share/doc/xlog/manual/output/html/search/pages_6b.js
share/doc/xlog/manual/output/html/search/pages_6c.html
share/doc/xlog/manual/output/html/search/pages_6c.js
share/doc/xlog/manual/output/html/search/pages_70.html
share/doc/xlog/manual/output/html/search/pages_70.js
share/doc/xlog/manual/output/html/search/search.css
share/doc/xlog/manual/output/html/search/search.js
share/doc/xlog/manual/output/html/search/search_l.png
share/doc/xlog/manual/output/html/search/search_m.png
share/doc/xlog/manual/output/html/search/search_r.png
share/doc/xlog/manual/output/html/sync_off.png
share/doc/xlog/manual/output/html/sync_on.png
share/doc/xlog/manual/output/html/tab_a.png
share/doc/xlog/manual/output/html/tab_b.png
share/doc/xlog/manual/output/html/tab_h.png
share/doc/xlog/manual/output/html/tab_s.png
share/doc/xlog/manual/output/html/tabs.css
share/doc/xlog/manual/output/html/xlog-clock.png
share/doc/xlog/manual/output/html/xlog-dialogs-export.png
share/doc/xlog/manual/output/html/xlog-dialogs-scoring.png
share/doc/xlog/manual/output/html/xlog-dialogs-workedbefore.png
share/doc/xlog/manual/output/html/xlog-dropdown.png
share/doc/xlog/manual/output/html/xlog-editbox.png
share/doc/xlog/manual/output/html/xlog-keyer.png
share/doc/xlog/manual/output/html/xlog-large.png
share/doc/xlog/manual/output/html/xlog-prefs-general.png
share/doc/xlog/manual/output/html/xlog-prefs-hamlib.png
share/doc/xlog/manual/output/html/xlog-prefs-info.png
share/doc/xlog/manual/output/html/xlog-prefs-logs.png
share/doc/xlog/manual/output/html/xlog.png
share/doc/xlog/manual/output/html/xlog_manual.css
share/doc/xlog/manual/preferences.dox
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