From c9e0c91c8c575140b09bd8c8796cf8491f97537c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 31 Oct 2014 18:30:10 +0000 Subject: [PATCH] Update to jpilot-1.8.2. --- comms/jpilot/Makefile | 34 ++++++++++---------- comms/jpilot/distinfo | 7 ++-- comms/jpilot/patches/patch-empty_Makefile_in | 12 ------- comms/jpilot/patches/patch-po_POTFILES_in | 11 ------- comms/jpilot/patches/patch-sync_c | 12 ------- comms/jpilot/patches/patch-utils_c | 12 ------- comms/jpilot/pkg/PFRAG.shared | 4 --- comms/jpilot/pkg/PLIST | 16 ++++----- 8 files changed, 25 insertions(+), 83 deletions(-) delete mode 100644 comms/jpilot/patches/patch-empty_Makefile_in delete mode 100644 comms/jpilot/patches/patch-po_POTFILES_in delete mode 100644 comms/jpilot/patches/patch-sync_c delete mode 100644 comms/jpilot/patches/patch-utils_c delete mode 100644 comms/jpilot/pkg/PFRAG.shared diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index b59eb3d54d7..3da3d085416 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,29 +1,31 @@ -# $OpenBSD: Makefile,v 1.66 2013/10/11 23:48:11 naddy Exp $ +# $OpenBSD: Makefile,v 1.67 2014/10/31 18:30:10 ajacoutot Exp $ + +SHARED_ONLY= Yes COMMENT= desktop organizer software for the palm pilot -DISTNAME= jpilot-1.8.0 -REVISION= 4 +DISTNAME= jpilot-1.8.2 CATEGORIES= comms -MASTER_SITES= ${HOMEPAGE} - HOMEPAGE= http://www.jpilot.org/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig -WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gpg-error m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre -WANTLIB += pixman-1 png pthread pthread-stubs xcb z pisock>=11 -WANTLIB += gcrypt>=14 gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += GL Xxf86vm drm ffi gthread-2.0 stdc++ xcb-render xcb-shm +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama +WANTLIB += Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig +WANTLIB += freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gpg-error graphite2 +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz m pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pcre pisock pixman-1 png pthread pthread-stubs +WANTLIB += xcb xcb-render xcb-shm z + +MASTER_SITES= http://www.jpilot.org/ LIB_DEPENDS= comms/pilot-link \ security/libgcrypt \ x11/gtk+2 + RUN_DEPENDS= devel/desktop-file-utils MODULES= devel/gettext \ @@ -33,15 +35,13 @@ USE_GMAKE= Yes CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -pthread" + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-pilot-prefix=${LOCALBASE} \ - --with-gtk-prefix=${LOCALBASE} - -MAKE_FLAGS= mkdir_p='mkdir -p' + --with-pilot-prefix=${LOCALBASE} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/jpilot.xpm ${PREFIX}/share/pixmaps + rm ${PREFIX}/lib/jpilot/plugins/*.{a,la} .include diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo index 8e56ea4bcc8..b30e9c1062c 100644 --- a/comms/jpilot/distinfo +++ b/comms/jpilot/distinfo @@ -1,5 +1,2 @@ -MD5 (jpilot-1.8.0.tar.gz) = 6mccNmjfWgAbXOAALgDu6A== -RMD160 (jpilot-1.8.0.tar.gz) = J6JDDn9g2EaMl/3DWJ5zRGgcLsw= -SHA1 (jpilot-1.8.0.tar.gz) = q8aoKCNTO/q4xQ/Of/8gz6qJgZM= -SHA256 (jpilot-1.8.0.tar.gz) = sA9rXS0BNXKo4qYBSyR+2oVbvV/vd+WeSdvvsxTFfd4= -SIZE (jpilot-1.8.0.tar.gz) = 1604468 +SHA256 (jpilot-1.8.2.tar.gz) = LCjtes6ieuPVQQNvLiyl7X4BIbrfR348+l7I0oIzfiM= +SIZE (jpilot-1.8.2.tar.gz) = 1740735 diff --git a/comms/jpilot/patches/patch-empty_Makefile_in b/comms/jpilot/patches/patch-empty_Makefile_in deleted file mode 100644 index d01a46ca7e0..00000000000 --- a/comms/jpilot/patches/patch-empty_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-empty_Makefile_in,v 1.1 2010/03/25 10:39:38 giovanni Exp $ ---- empty/Makefile.in.orig Wed Mar 24 16:15:00 2010 -+++ empty/Makefile.in Wed Mar 24 16:17:54 2010 -@@ -287,7 +287,7 @@ install-pdbDATA: $(pdb_DATA) - test -z "$(pdbdir)" || $(mkdir_p) "$(DESTDIR)$(pdbdir)" - @list='$(pdb_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ f="`echo $$p | sed -e 's|^.*/||' -e 's|ñ|n|'`"; \ - echo " $(pdbDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdbdir)/$$f'"; \ - $(pdbDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdbdir)/$$f"; \ - done diff --git a/comms/jpilot/patches/patch-po_POTFILES_in b/comms/jpilot/patches/patch-po_POTFILES_in deleted file mode 100644 index 917001c1b25..00000000000 --- a/comms/jpilot/patches/patch-po_POTFILES_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-po_POTFILES_in,v 1.1 2010/03/25 10:39:38 giovanni Exp $ ---- po/POTFILES.in.orig Wed Mar 24 09:17:59 2010 -+++ po/POTFILES.in Wed Mar 24 09:18:09 2010 -@@ -1,6 +1,7 @@ - address.c - address_gui.c - alarms.c -+calendar.c - category.c - contact.c - dat.c diff --git a/comms/jpilot/patches/patch-sync_c b/comms/jpilot/patches/patch-sync_c deleted file mode 100644 index 6651f0160e0..00000000000 --- a/comms/jpilot/patches/patch-sync_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-sync_c,v 1.3 2010/03/25 10:39:38 giovanni Exp $ ---- sync.c.orig Sun Feb 28 19:56:52 2010 -+++ sync.c Wed Mar 24 17:06:11 2010 -@@ -1146,7 +1146,7 @@ int sync_fetch(int sd, unsigned int flags, const int n - "ToDoDB", - "MemoDB", - #ifdef ENABLE_MANANA -- "MañanaDB", -+ "MananaDB", - #endif - "Saved Preferences", - "" diff --git a/comms/jpilot/patches/patch-utils_c b/comms/jpilot/patches/patch-utils_c deleted file mode 100644 index 5f2ae7ebe58..00000000000 --- a/comms/jpilot/patches/patch-utils_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-utils_c,v 1.3 2010/03/25 10:39:38 giovanni Exp $ ---- utils.c.orig Wed Mar 24 16:14:07 2010 -+++ utils.c Wed Mar 24 16:14:21 2010 -@@ -550,7 +550,7 @@ int check_copy_DBs_to_home(void) - "ContactsDB-PAdd.pdb", - "ToDoDB.pdb", - "TasksDB-PTod.pdb", -- "MañanaDB.pdb", -+ "MananaDB.pdb", - "MemoDB.pdb", - "MemosDB-PMem.pdb", - "Memo32DB.pdb", diff --git a/comms/jpilot/pkg/PFRAG.shared b/comms/jpilot/pkg/PFRAG.shared deleted file mode 100644 index 68c3d7a0855..00000000000 --- a/comms/jpilot/pkg/PFRAG.shared +++ /dev/null @@ -1,4 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2005/01/23 06:06:01 pvalchev Exp $ -lib/jpilot/plugins/libexpense.so -lib/jpilot/plugins/libkeyring.so -lib/jpilot/plugins/libsynctime.so diff --git a/comms/jpilot/pkg/PLIST b/comms/jpilot/pkg/PLIST index 08bbe941e0b..5fe876fce1d 100644 --- a/comms/jpilot/pkg/PLIST +++ b/comms/jpilot/pkg/PLIST @@ -1,18 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.15 2010/03/25 10:39:38 giovanni Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.16 2014/10/31 18:30:10 ajacoutot Exp $ @bin bin/jpilot @bin bin/jpilot-dump +@bin bin/jpilot-merge @bin bin/jpilot-sync lib/jpilot/ lib/jpilot/plugins/ -@comment lib/jpilot/plugins/libexpense.a -@comment lib/jpilot/plugins/libexpense.la -@comment lib/jpilot/plugins/libkeyring.a -@comment lib/jpilot/plugins/libkeyring.la -@comment lib/jpilot/plugins/libsynctime.a -@comment lib/jpilot/plugins/libsynctime.la +lib/jpilot/plugins/libexpense.so +lib/jpilot/plugins/libkeyring.so +lib/jpilot/plugins/libsynctime.so @comment @man man/man1/jpilot-dial.1 @man man/man1/jpilot-dump.1 +@man man/man1/jpilot-merge.1 @man man/man1/jpilot-sync.1 @man man/man1/jpilot.1 share/applications/jpilot.desktop @@ -80,8 +78,6 @@ share/locale/nb/LC_MESSAGES/jpilot.mo share/locale/nl/LC_MESSAGES/jpilot.mo share/locale/pt_BR/LC_MESSAGES/jpilot.mo share/locale/ru/LC_MESSAGES/jpilot.mo -share/locale/rw/ -share/locale/rw/LC_MESSAGES/ share/locale/rw/LC_MESSAGES/jpilot.mo share/locale/sv/LC_MESSAGES/jpilot.mo share/locale/tr/LC_MESSAGES/jpilot.mo