cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update jpilot-1.6.0

Browse Source 
* support for MemosDB-PMem and ContactsDB-PAdd
  * added sortable columns in KeyRing
  * many bug fixes and small changes
- rework DESCR
- use textproc/intltool MODULE
This commit is contained in:
ajacoutot 2008-06-01 15:27:46 +00:00
parent 66856ad8b0
commit 8e30301eb2
12 changed files with 45 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
comms/jpilot/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.47 2008/01/04 17:48:33 espie Exp $ # $OpenBSD: Makefile,v 1.48 2008/06/01 15:27:46 ajacoutot Exp $
COMMENT= desktop organizer software for the palm pilot COMMENT= desktop organizer software for the palm pilot
DISTNAME= jpilot-0.99.9 DISTNAME= jpilot-1.6.0
PKGNAME= ${DISTNAME}p6
CATEGORIES= comms palm CATEGORIES= comms palm
MASTER_SITES= ${HOMEPAGE} MASTER_SITES= ${HOMEPAGE}
@ -22,31 +21,26 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto \
expat fontconfig freetype glib-2.0 glitz gmodule-2.0 \ expat fontconfig freetype glib-2.0 glitz gmodule-2.0 \
gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pcre png pthread z pcre pixman-1 png pthread z
LIB_DEPENDS= pisock.>=9::comms/pilot-link \ LIB_DEPENDS= pisock.>=9::comms/pilot-link \
gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2 gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
MODULES= devel/gettext MODULES= devel/gettext \
textproc/intltool
USE_LIBTOOL= yes USE_LIBTOOL= Yes
USE_X11= yes USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread" LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-pilot-prefix=${LOCALBASE} \ --with-pilot-prefix=${LOCALBASE} \
--with-gtk-prefix=${LOCALBASE} --with-gtk-prefix=${LOCALBASE}
MAN1= jpilot-dump.1 jpilot-sync.1 jpilot.1
MAKE_FLAGS= mkdir_p='mkdir -p' MAKE_FLAGS= mkdir_p='mkdir -p'
pre-build:
.for i in ${MAN1}
perl -pi -e "s,/usr/share,${LOCALBASE}/share,g" ${WRKSRC}/docs/${i}
.endfor
.include <bsd.port.mk> .include <bsd.port.mk>

10
comms/jpilot/distinfo
View File

@ -1,5 +1,5 @@
MD5 (jpilot-0.99.9.tar.gz) = w53ymu7Ve4SmdFJIVuvCkA== MD5 (jpilot-1.6.0.tar.gz) = eRjTRft+S2RKchHbA93RSA==
RMD160 (jpilot-0.99.9.tar.gz) = Aoa5+Vedu9uOm9IHOEVhgUurURQ= RMD160 (jpilot-1.6.0.tar.gz) = xGEDYMLM3o4ytGZ0aUdgb+kmDfk=
SHA1 (jpilot-0.99.9.tar.gz) = GadviBUYiht5k/v/gWJOhSo7vFw= SHA1 (jpilot-1.6.0.tar.gz) = 1Iljw0t/J7EREdqWblT9VVR3oZo=
SHA256 (jpilot-0.99.9.tar.gz) = NBSRrXJ+I0tYx9XwV7z/Nj0V0vIjwb6rBfxJgg3+ZDI= SHA256 (jpilot-1.6.0.tar.gz) = 5gbrrZgX+Q41hRXb4GyIdZK6etTqY1e97W65E52MNe8=
SIZE (jpilot-0.99.9.tar.gz) = 1671351 SIZE (jpilot-1.6.0.tar.gz) = 1573667

10
comms/jpilot/patches/patch-Expense_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Expense_Makefile_in,v 1.8 2006/10/20 11:49:42 ajacoutot Exp $ $OpenBSD: patch-Expense_Makefile_in,v 1.9 2008/06/01 15:27:46 ajacoutot Exp $
--- Expense/Makefile.in.orig Thu Aug 24 01:22:09 2006 --- Expense/Makefile.in.orig Sun Jun 1 16:00:45 2008
+++ Expense/Makefile.in Mon Aug 28 11:19:49 2006 +++ Expense/Makefile.in Sun Jun 1 16:01:08 2008
@@ -248,7 +248,7 @@ target_alias = @target_alias@ @@ -244,7 +244,7 @@ target_alias = @target_alias@
@MAKE_EXPENSE_TRUE@lib_LTLIBRARIES = libexpense.la @MAKE_EXPENSE_TRUE@lib_LTLIBRARIES = libexpense.la
@MAKE_EXPENSE_TRUE@libexpense_la_SOURCES = expense.c @MAKE_EXPENSE_TRUE@libexpense_la_SOURCES = expense.c
@MAKE_EXPENSE_TRUE@libexpense_la_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir) @MAKE_EXPENSE_TRUE@libexpense_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
-@MAKE_EXPENSE_TRUE@libexpense_la_LDFLAGS = @GTK_LIBS@ -@MAKE_EXPENSE_TRUE@libexpense_la_LDFLAGS = @GTK_LIBS@
+@MAKE_EXPENSE_TRUE@libexpense_la_LDFLAGS = @GTK_LIBS@ -module -avoid-version +@MAKE_EXPENSE_TRUE@libexpense_la_LDFLAGS = @GTK_LIBS@ -module -avoid-version
all: all-am all: all-am

10
comms/jpilot/patches/patch-KeyRing_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-KeyRing_Makefile_in,v 1.4 2006/10/20 11:49:42 ajacoutot Exp $ $OpenBSD: patch-KeyRing_Makefile_in,v 1.5 2008/06/01 15:27:46 ajacoutot Exp $
--- KeyRing/Makefile.in.orig Thu Aug 24 01:22:09 2006 --- KeyRing/Makefile.in.orig Sun Jun 1 16:01:22 2008
+++ KeyRing/Makefile.in Mon Aug 28 11:19:49 2006 +++ KeyRing/Makefile.in Sun Jun 1 16:01:42 2008
@@ -249,7 +249,7 @@ EXTRA_DIST = README.txt @@ -245,7 +245,7 @@ EXTRA_DIST = README.txt
@MAKE_KEYRING_TRUE@lib_LTLIBRARIES = libkeyring.la @MAKE_KEYRING_TRUE@lib_LTLIBRARIES = libkeyring.la
@MAKE_KEYRING_TRUE@libkeyring_la_SOURCES = keyring.c @MAKE_KEYRING_TRUE@libkeyring_la_SOURCES = keyring.c
@MAKE_KEYRING_TRUE@libkeyring_la_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir) @MAKE_KEYRING_TRUE@libkeyring_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
-@MAKE_KEYRING_TRUE@libkeyring_la_LDFLAGS = -lcrypto @GTK_LIBS@ -@MAKE_KEYRING_TRUE@libkeyring_la_LDFLAGS = -lcrypto @GTK_LIBS@
+@MAKE_KEYRING_TRUE@libkeyring_la_LDFLAGS = -lcrypto @GTK_LIBS@ -module -avoid-version +@MAKE_KEYRING_TRUE@libkeyring_la_LDFLAGS = -lcrypto @GTK_LIBS@ -module -avoid-version
all: all-am all: all-am

10
comms/jpilot/patches/patch-SyncTime_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-SyncTime_Makefile_in,v 1.8 2006/10/20 11:49:42 ajacoutot Exp $ $OpenBSD: patch-SyncTime_Makefile_in,v 1.9 2008/06/01 15:27:46 ajacoutot Exp $
--- SyncTime/Makefile.in.orig Thu Aug 24 01:22:10 2006 --- SyncTime/Makefile.in.orig Sun Jun 1 16:01:52 2008
+++ SyncTime/Makefile.in Mon Aug 28 11:19:49 2006 +++ SyncTime/Makefile.in Sun Jun 1 16:02:10 2008
@@ -248,7 +248,7 @@ target_alias = @target_alias@ @@ -244,7 +244,7 @@ target_alias = @target_alias@
@MAKE_SYNCTIME_TRUE@lib_LTLIBRARIES = libsynctime.la @MAKE_SYNCTIME_TRUE@lib_LTLIBRARIES = libsynctime.la
@MAKE_SYNCTIME_TRUE@libsynctime_la_SOURCES = synctime.c @MAKE_SYNCTIME_TRUE@libsynctime_la_SOURCES = synctime.c
@MAKE_SYNCTIME_TRUE@libsynctime_la_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir) @MAKE_SYNCTIME_TRUE@libsynctime_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
-@MAKE_SYNCTIME_TRUE@libsynctime_la_LDFLAGS = @GTK_LIBS@ -@MAKE_SYNCTIME_TRUE@libsynctime_la_LDFLAGS = @GTK_LIBS@
+@MAKE_SYNCTIME_TRUE@libsynctime_la_LDFLAGS = @GTK_LIBS@ -module -avoid-version +@MAKE_SYNCTIME_TRUE@libsynctime_la_LDFLAGS = @GTK_LIBS@ -module -avoid-version
all: all-am all: all-am

12
comms/jpilot/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2005/10/31 21:08:15 naddy Exp $
--- configure.orig Mon Oct 31 21:51:42 2005
+++ configure Mon Oct 31 21:57:35 2005
@@ -20056,7 +20056,7 @@ fi
if test "x" != "xno-xml"; then
echo "$as_me:$LINENO: checking for XML::Parser" >&5
echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ if : `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
else

12
comms/jpilot/patches/patch-docs_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-docs_Makefile_in,v 1.3 2006/10/20 11:49:42 ajacoutot Exp $
--- docs/Makefile.in.orig Thu Aug 24 01:22:10 2006
+++ docs/Makefile.in Mon Aug 28 11:19:49 2006
@@ -232,7 +232,7 @@ target_alias = @target_alias@
# install the man pages
man_MANS = jpilot.1 jpilot-dial.1 jpilot-sync.1 jpilot-dump.1
-miscdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+miscdir = $(prefix)/share/doc/$(PACKAGE)
misc_DATA = ../BUGS \
../ChangeLog \
../COPYING \

12
comms/jpilot/patches/patch-icons_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-icons_Makefile_in,v 1.3 2006/10/20 11:49:42 ajacoutot Exp $
--- icons/Makefile.in.orig Thu Aug 24 01:22:10 2006
+++ icons/Makefile.in Mon Aug 28 11:19:49 2006
@@ -224,7 +224,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-icondir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/icons
+icondir = $(prefix)/share/doc/$(PACKAGE)/icons
icon_DATA = jpilot-icon1.xpm \
jpilot-icon2.xpm \
jpilot-icon3.xpm \

69
comms/jpilot/patches/patch-jpilot_c
View File

@ -1,69 +0,0 @@
$OpenBSD: patch-jpilot_c,v 1.2 2006/10/20 11:49:42 ajacoutot Exp $
--- jpilot.c.orig Fri Jun 9 22:42:57 2006
+++ jpilot.c Wed Sep 27 09:30:26 2006
@@ -1,4 +1,4 @@
-/* $Id: patch-jpilot_c,v 1.2 2006/10/20 11:49:42 ajacoutot Exp $ */
+/* $Id: patch-jpilot_c,v 1.2 2006/10/20 11:49:42 ajacoutot Exp $ */
/*******************************************************************************
* jpilot.c
@@ -1953,11 +1953,21 @@ int main(int argc, char *argv[])
GtkWidget *menubar;
#ifdef ENABLE_GTK2
GtkWidget *scrolled_window;
- char *week_start;
- int pref_fdow = 0;
#else
GtkWidget *vscrollbar;
#endif
+/* Extract first day of week preference from locale in GTK2 */
+#ifdef ENABLE_GTK2
+ int pref_fdow = 0;
+# ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+ char *langinfo;
+ int week_1stday = 0;
+ int first_weekday = 1;
+ unsigned int week_origin;
+# else
+ char *week_start;
+# endif
+#endif
unsigned char skip_past_alarms;
unsigned char skip_all_alarms;
int filedesc[2];
@@ -2179,18 +2189,31 @@ char * xpm_backup[] = {
pref_read_rc_file();
/* Extract first day of week preference from locale in GTK2 */
+
# ifdef ENABLE_GTK2
-# ifdef HAVE_LANGINFO_H
+# ifdef HAVE__NL_TIME_FIRST_WEEKDAY
/* GTK 2.8 libraries */
- week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
- pref_fdow = *((unsigned char *) week_start) - 1;
+ langinfo = nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
+ first_weekday = langinfo[0];
+ langinfo = nl_langinfo(_NL_TIME_WEEK_1STDAY);
+ week_origin = GPOINTER_TO_INT(langinfo);
+ if (week_origin == 19971130) /* Sunday */
+ week_1stday = 0;
+ else if (week_origin == 19971201) /* Monday */
+ week_1stday = 1;
+ else
+ g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
+
+ pref_fdow = (week_1stday + first_weekday - 1) % 7;
# else
/* GTK 2.6 libraries */
# if defined(ENABLE_NLS)
week_start = dgettext("gtk20", "calendar:week_start:0");
if (strncmp("calendar:week_start:", week_start, 20) == 0) {
pref_fdow = *(week_start + 20) - '0';
- }
+ } else {
+ pref_fdow = -1;
+ }
# endif
# endif
if (pref_fdow > 1)

12
comms/jpilot/patches/patch-print_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-print_c,v 1.1 2006/12/31 10:47:39 ajacoutot Exp $
--- print.c.orig Fri Dec 29 01:32:28 2006
+++ print.c Fri Dec 29 01:31:58 2006
@@ -946,7 +946,7 @@ int print_address_header()
"pop pop pop ( )\n"
"} if\n"
"("Q_FLAG_CHAR"END) search { %%if\n"
- " stop\n"
+ " showpage stop\n"
"} if\n"
"("Q_FLAG_CHAR"C12) search {\n"
"/Courier-ISOLatin1 12 selectfont\n"

6
comms/jpilot/pkg/DESCR
View File

@ -1,4 +1,4 @@
J-Pilot is a desktop organizer application for the palm pilot that J-Pilot is a desktop organizer application for the palm pilot that
runs under Linux, and Unix. It is similar in functionality to the runs under Linux and Unix. It is similar in functionality to the
one that 3com distributes for a well known rampant legacy operating one that 3Com distributes and has many features not found in the 3Com
system. desktop.

10
comms/jpilot/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2007/07/13 08:54:26 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.12 2008/06/01 15:27:46 ajacoutot Exp $
%%SHARED%% %%SHARED%%
bin/jpilot bin/jpilot
bin/jpilot-dump bin/jpilot-dump
@ -15,7 +15,6 @@ lib/jpilot/plugins/
@man man/man1/jpilot-dump.1 @man man/man1/jpilot-dump.1
@man man/man1/jpilot-sync.1 @man man/man1/jpilot-sync.1
@man man/man1/jpilot.1 @man man/man1/jpilot.1
share/applications/
share/applications/jpilot.desktop share/applications/jpilot.desktop
share/doc/jpilot/ share/doc/jpilot/
share/doc/jpilot/AUTHORS share/doc/jpilot/AUTHORS
@ -53,10 +52,14 @@ share/doc/jpilot/manual/manual.html
share/doc/jpilot/manual/plugin.html share/doc/jpilot/manual/plugin.html
share/jpilot/ share/jpilot/
share/jpilot/AddressDB.pdb share/jpilot/AddressDB.pdb
share/jpilot/CalendarDB-PDat.pdb
share/jpilot/ContactsDB-PAdd.pdb
share/jpilot/DatebookDB.pdb share/jpilot/DatebookDB.pdb
share/jpilot/ExpenseDB.pdb share/jpilot/ExpenseDB.pdb
share/jpilot/Memo32DB.pdb share/jpilot/Memo32DB.pdb
share/jpilot/MemoDB.pdb share/jpilot/MemoDB.pdb
share/jpilot/MemosDB-PMem.pdb
share/jpilot/TasksDB-PTod.pdb
share/jpilot/ToDoDB.pdb share/jpilot/ToDoDB.pdb
share/jpilot/jpilotrc.blue share/jpilot/jpilotrc.blue
share/jpilot/jpilotrc.default share/jpilot/jpilotrc.default
@ -72,8 +75,9 @@ share/locale/fr/LC_MESSAGES/jpilot.mo
share/locale/it/LC_MESSAGES/jpilot.mo share/locale/it/LC_MESSAGES/jpilot.mo
share/locale/ja/LC_MESSAGES/jpilot.mo share/locale/ja/LC_MESSAGES/jpilot.mo
share/locale/ko/LC_MESSAGES/jpilot.mo share/locale/ko/LC_MESSAGES/jpilot.mo
share/locale/nb/LC_MESSAGES/jpilot.mo
share/locale/nl/LC_MESSAGES/jpilot.mo share/locale/nl/LC_MESSAGES/jpilot.mo
share/locale/no/LC_MESSAGES/jpilot.mo share/locale/pt_BR/LC_MESSAGES/jpilot.mo
share/locale/ru/LC_MESSAGES/jpilot.mo share/locale/ru/LC_MESSAGES/jpilot.mo
share/locale/rw/ share/locale/rw/
share/locale/rw/LC_MESSAGES/ share/locale/rw/LC_MESSAGES/