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

Update to jpilot-0.99.2

Browse Source 
Thanks to the author who accepted most patches in this release.
This commit is contained in:
pvalchev 2002-02-18 23:17:56 +00:00
parent 4f6fa9a7a6
commit 7b7768bdbd
17 changed files with 76 additions and 840 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
comms/jpilot/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2001/11/01 08:27:14 wilfried Exp $
# $OpenBSD: Makefile,v 1.20 2002/02/18 23:17:56 pvalchev Exp $
COMMENT= "desktop organizer software for the palm pilot"
DISTNAME= jpilot-0.99
PKGNAME= ${DISTNAME}p1
DISTNAME= jpilot-0.99.2
PKGNAME= ${DISTNAME}
CATEGORIES= comms palm
NEED_VERSION= 1.475
NEED_VERSION= 1.504
MASTER_SITES= ${HOMEPAGE}
@ -18,22 +18,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.0-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.0-ltmain_sh \
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
patch-*
LIB_DEPENDS= pisock.3:pilot-link-*:comms/pilot-link \
gtk.1.2,gdk.1.2:gtk+-*:x11/gtk+
MODULES= gettext
USE_X11= Yes
CONFIGURE_STYLE= autoconf dest
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpilot
${INSTALL_DATA} ${WRKSRC}/docs/plugin.html ${PREFIX}/share/doc/jpilot
${INSTALL_DATA} ${WRKSRC}/docs/manual.html ${PREFIX}/share/doc/jpilot
.include <bsd.port.mk>

3
comms/jpilot/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (jpilot-0.99.2.tar.gz) = 57be9e7cd2b2878fd439c98d77d4bdb9
RMD160 (jpilot-0.99.2.tar.gz) = d98facb8f2734305ad5f2da051d1b77c2acd419d
SHA1 (jpilot-0.99.2.tar.gz) = 9f6d670db82a0c25e014bc1499664a767c631661

3
comms/jpilot/files/md5
View File

@ -1,3 +0,0 @@
MD5 (jpilot-0.99.tar.gz) = a6c8c1a9bc74f8a3f8403c451fdaef0f
RMD160 (jpilot-0.99.tar.gz) = 0f7e2272b5fb965862f75bfeef0e55bb2481152a
SHA1 (jpilot-0.99.tar.gz) = d52e4b31872c1b20bf882c8a062fdb954c8f4b1f

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

@ -1,29 +0,0 @@
$OpenBSD: patch-Expense_Makefile_in,v 1.3 2001/07/22 20:40:06 pvalchev Exp $
--- Expense/Makefile.in.orig Thu Dec 7 15:44:26 2000
+++ Expense/Makefile.in Sun Jul 22 13:57:28 2001
@@ -28,7 +28,8 @@ libexpense.so: expense.o
$(CC) $(OPTIONS) -o libexpense.la \
expense.lo \
-rpath $(prefix)/lib/jpilot/plugins \
- -version-info 1:1
+ -version-info 1:1 \
+ -avoid-version
# -L. -lplugin
# ld -shared -ldl -o libexpense.so expense.o -L. -lplugin
@@ -52,13 +53,13 @@ distclean: clean
install:
./install-sh -d -m 755 $(prefix)/lib/jpilot; \
./install-sh -d -m 755 $(prefix)/lib/jpilot/plugins; \
- ../libtool --mode=install ./install-sh \
+ ../libtool --mode=install ./install-sh -c \
libexpense.la $(prefix)/lib/jpilot/plugins
local_install:
./install-sh -d -m 755 $(HOME)/.jpilot; \
./install-sh -d -m 755 $(HOME)/.jpilot/plugins; \
- ../libtool --mode=install ./install-sh \
+ ../libtool --mode=install ./install-sh -c \
libexpense.la $(HOME)/.jpilot/plugins
uninstall:

112
comms/jpilot/patches/patch-Expense_configure
View File

@ -1,112 +0,0 @@
$OpenBSD: patch-Expense_configure,v 1.1.1.1 2001/05/29 00:54:44 pvalchev Exp $
--- Expense/configure.orig Sun May 27 17:22:06 2001
+++ Expense/configure Sun May 27 17:22:20 2001
@@ -782,8 +782,41 @@ fi
cflags=$CFLAGS
+pilot_prefix=""
+# Check whether --with-pilot_prefix or --without-pilot_prefix was given.
+if test "${with_pilot_prefix+set}" = set; then
+ withval="$with_pilot_prefix"
+ :
+fi
+
+
+if test "x$with_pilot_prefix" != "x"; then
+ pilot_prefix=$with_pilot_prefix
+fi
+
+echo $ac_n "checking for pilot-link header files""... $ac_c" 1>&6
+echo "configure:799: checking for pilot-link header files" >&5
+pilotinclude=${FORCE_PILOT_INCLUDES:-no}
+if test $pilotinclude = no ; then
+for pilot_incl in $pilot_prefix/include /usr/include /usr/local/include \
+ /usr/extra/pilot/include /usr/include/libpisock; do
+ if test -r "$pilot_incl/pi-config.h" ; then
+ pilotinclude=yes
+ PILOT_FLAGS="$PILOT_FLAGS -I$pilot_incl"
+ break
+ fi
+done
+fi
+
+if test $pilotinclude = no ; then
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: Could not find the pilot-link header files" 1>&2; exit 1; }
+else
+ echo "$ac_t""found at $pilot_incl" 1>&6
+fi
+
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:787: checking for main in -lsocket" >&5
+echo "configure:820: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -791,14 +824,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 795 "configure"
+#line 828 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -819,39 +852,6 @@ else
fi
-pilot_prefix=""
-# Check whether --with-pilot_prefix or --without-pilot_prefix was given.
-if test "${with_pilot_prefix+set}" = set; then
- withval="$with_pilot_prefix"
- :
-fi
-
-
-if test "x$with_pilot_prefix" != "x"; then
- pilot_prefix=$with_pilot_prefix
-fi
-
-echo $ac_n "checking for pilot-link header files""... $ac_c" 1>&6
-echo "configure:836: checking for pilot-link header files" >&5
-pilotinclude=${FORCE_PILOT_INCLUDES:-no}
-if test $pilotinclude = no ; then
-for pilot_incl in $pilot_prefix/include /usr/include /usr/local/include \
- /usr/extra/pilot/include /usr/include/libpisock; do
- if test -r "$pilot_incl/pi-config.h" ; then
- pilotinclude=yes
- PILOT_FLAGS="$PILOT_FLAGS -I$pilot_incl"
- break
- fi
-done
-fi
-
-if test $pilotinclude = no ; then
- echo "$ac_t""no" 1>&6
- { echo "configure: error: Could not find the pilot-link header files" 1>&2; exit 1; }
-else
- echo "$ac_t""found at $pilot_incl" 1>&6
-fi
-
echo $ac_n "checking for pilot library files""... $ac_c" 1>&6
echo "configure:857: checking for pilot library files" >&5
pilotlibs=${FORCE_PILOT_LIBS:-no}
@@ -860,7 +860,7 @@ PILOT_LIBS="-lpisock"
if test $pilotlibs = no ; then
for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
/usr/extra/pilot/lib ; do
- if test -r "$pilot_libs/libpisock.so" ; then
+ if test -r "$pilot_libs/libpisock.a" ; then
pilotlibs=yes
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
break

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

@ -1,12 +0,0 @@
$OpenBSD: patch-Expense_configure_in,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- Expense/configure.in.orig Sun May 27 17:22:02 2001
+++ Expense/configure.in Sun May 27 17:22:19 2001
@@ -65,7 +65,7 @@ PILOT_LIBS="-lpisock"
if test $pilotlibs = no ; then
for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
/usr/extra/pilot/lib ; do
- if test -r "$pilot_libs/libpisock.so" ; then
+ if test -r "$pilot_libs/libpisock.a" ; then
pilotlibs=yes
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
break

33
comms/jpilot/patches/patch-Makefile.in
View File

@ -1,33 +0,0 @@
--- Makefile.in.orig Tue Feb 6 12:31:05 2001
+++ Makefile.in Sat Jun 2 12:20:33 2001
@@ -43,7 +43,7 @@ GTKLIBS = @GTK_LIBS@
INTLLIBS = @INTLLIBS@
# Targets
-all: po_dir intl_dir jpilot jpilot-sync jpilot-dump
+all: po_dir intl_dir jpilot jpilot-sync jpilot-dump synctime expense
jpilot: jpilot.o datebook.o address.o todo.o memo.o \
utils.o sync.o prefs.o log.o plugins.o \
@@ -215,6 +215,12 @@ po_dir:
intl_dir:
cd intl; $(MAKE)
+synctime:
+ cd SyncTime; $(MAKE)
+
+expense:
+ cd Expense; $(MAKE)
+
clean:
rm -f *.o *~ config.cache
@@ -256,6 +262,8 @@ install:
./install-sh -c -m 755 empty/MemoDB.pdb $(prefix)/share/jpilot/
cd intl; $(MAKE) install
cd po; $(MAKE) install
+ cd SyncTime; $(MAKE) install
+ cd Expense; $(MAKE) install
uninstall:
rm -f $(prefix)/share/jpilot/*

64
comms/jpilot/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,64 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/02/18 23:17:57 pvalchev Exp $
--- Makefile.in.orig Tue Feb 5 23:29:18 2002
+++ Makefile.in Mon Feb 18 15:47:56 2002
@@ -118,7 +118,7 @@ prefix=@prefix@
mandir=@mandir@
datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
+localedir = $(prefix)/share/locale
gnulocaledir = $(prefix)/share/locale
#Pilot flags (include dir), and Libraries
@@ -427,39 +427,21 @@ install: all $(install_plugins_$(PLUGIN_
$(INSTALL) -m 644 empty/MemoDB.pdb $(prefix)/share/$(PACKAGE)/
$(INSTALL) -m 644 empty/Memo32DB.pdb $(prefix)/share/$(PACKAGE)/
$(INSTALL) -m 644 empty/ExpenseDB.pdb $(prefix)/share/$(PACKAGE)/
- $(INSTALL) -d -m 755 $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/manual.html $(prefix)/doc/$(PACKAGE)-$(VERSION)/manual.html
- $(INSTALL) -m 644 docs/plugin.html $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-address.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-datebook.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-expense.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-install.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-memo.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-prefs.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-print.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-search.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-todo.png $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 644 docs/jpilot-toplogo.jpg $(prefix)/doc/$(PACKAGE)-$(VERSION)
- $(INSTALL) -d -m 644 $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons
- $(INSTALL) -m 644 icons/README $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/README
- $(INSTALL) -m 644 icons/jpilot-icon1.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
- $(INSTALL) -m 644 icons/jpilot-icon2.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
- $(INSTALL) -m 644 icons/jpilot-icon3.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
- $(INSTALL) -m 644 icons/jpilot-icon4.xpm $(prefix)/doc/$(PACKAGE)-$(VERSION)/icons/
- $(INSTALL) -m 644 BUGS $(prefix)/doc/$(PACKAGE)-$(VERSION)/
- $(INSTALL) -m 644 CHANGELOG $(prefix)/doc/$(PACKAGE)-$(VERSION)/
- $(INSTALL) -m 644 COPYING $(prefix)/doc/$(PACKAGE)-$(VERSION)/
- $(INSTALL) -m 644 CREDITS $(prefix)/doc/$(PACKAGE)-$(VERSION)/
- $(INSTALL) -m 644 INSTALL $(prefix)/doc/$(PACKAGE)-$(VERSION)/
- $(INSTALL) -m 644 README $(prefix)/doc/$(PACKAGE)-$(VERSION)/
- $(INSTALL) -m 644 TODO $(prefix)/doc/$(PACKAGE)-$(VERSION)/
- $(INSTALL) -m 644 UPGRADING $(prefix)/doc/$(PACKAGE)-$(VERSION)/
+ $(INSTALL) -d -m 755 $(prefix)/share/doc/$(PACKAGE)
+ $(INSTALL) -m 644 docs/manual.html $(prefix)/share/doc/$(PACKAGE)
+ $(INSTALL) -m 644 docs/plugin.html $(prefix)/share/doc/$(PACKAGE)
+ $(INSTALL) -d -m 755 $(prefix)/share/$(PACKAGE)/icons
+ $(INSTALL) -m 644 icons/README $(prefix)/share/$(PACKAGE)/icons/README
+ $(INSTALL) -m 644 icons/jpilot-icon1.xpm $(prefix)/share/$(PACKAGE)/icons/
+ $(INSTALL) -m 644 icons/jpilot-icon2.xpm $(prefix)/share/$(PACKAGE)/icons/
+ $(INSTALL) -m 644 icons/jpilot-icon3.xpm $(prefix)/share/$(PACKAGE)/icons/
+ $(INSTALL) -m 644 icons/jpilot-icon4.xpm $(prefix)/share/$(PACKAGE)/icons/
cd intl; $(MAKE) install
cd po; $(MAKE) install
$(INSTALL) -d -m 755 $(mandir)/man1/
- cat docs/jpilot.1 | gzip -9c > $(mandir)/man1/jpilot.1.gz
- cat docs/jpilot-sync.1 | gzip -9c > $(mandir)/man1/jpilot-sync.1.gz
- cat docs/jpilot-upgrade-99.1 | gzip -9c > $(mandir)/man1/jpilot-upgrade-99.1.gz
+ cat docs/jpilot.1 > $(mandir)/man1/jpilot.1
+ cat docs/jpilot-sync.1 > $(mandir)/man1/jpilot-sync.1
+ cat docs/jpilot-upgrade-99.1 > $(mandir)/man1/jpilot-upgrade-99.1
install_plugins:
cd SyncTime; $(MAKE) install

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

@ -1,29 +0,0 @@
$OpenBSD: patch-SyncTime_Makefile_in,v 1.3 2001/07/22 20:40:06 pvalchev Exp $
--- SyncTime/Makefile.in.orig Thu Dec 7 15:44:26 2000
+++ SyncTime/Makefile.in Sun Jul 22 13:57:01 2001
@@ -28,7 +28,8 @@ libsynctime.so: synctime.o
$(CC) $(OPTIONS) -o libsynctime.la \
synctime.lo \
-rpath $(prefix)/lib/jpilot/plugins \
- -version-info 1:1
+ -version-info 1:1 \
+ -avoid-version
# -L. -lplugin
# ld -shared -ldl -o libsynctime.so synctime.o -L. -lplugin
@@ -52,13 +53,13 @@ distclean: clean
install:
./install-sh -d -m 755 $(prefix)/lib/jpilot; \
./install-sh -d -m 755 $(prefix)/lib/jpilot/plugins; \
- ../libtool --mode=install ./install-sh \
+ ../libtool --mode=install ./install-sh -c \
libsynctime.la $(prefix)/lib/jpilot/plugins
local_install:
./install-sh -d -m 755 $(HOME)/.jpilot; \
./install-sh -d -m 755 $(HOME)/.jpilot/plugins; \
- ../libtool --mode=install ./install-sh \
+ ../libtool --mode=install ./install-sh -c \
libsynctime.la $(HOME)/.jpilot/plugins
uninstall:

123
comms/jpilot/patches/patch-SyncTime_configure
View File

@ -1,123 +0,0 @@
$OpenBSD: patch-SyncTime_configure,v 1.1.1.1 2001/05/29 00:54:46 pvalchev Exp $
--- SyncTime/configure.orig Sun May 27 17:20:39 2001
+++ SyncTime/configure Sun May 27 17:20:58 2001
@@ -782,8 +782,41 @@ fi
cflags=$CFLAGS
+pilot_prefix=""
+# Check whether --with-pilot_prefix or --without-pilot_prefix was given.
+if test "${with_pilot_prefix+set}" = set; then
+ withval="$with_pilot_prefix"
+ :
+fi
+
+
+if test "x$with_pilot_prefix" != "x"; then
+ pilot_prefix=$with_pilot_prefix
+fi
+
+echo $ac_n "checking for pilot-link header files""... $ac_c" 1>&6
+echo "configure:799: checking for pilot-link header files" >&5
+pilotinclude=${FORCE_PILOT_INCLUDES:-no}
+if test $pilotinclude = no ; then
+for pilot_incl in $pilot_prefix/include /usr/include /usr/local/include \
+ /usr/extra/pilot/include /usr/include/libpisock; do
+ if test -r "$pilot_incl/pi-config.h" ; then
+ pilotinclude=yes
+ PILOT_FLAGS="$PILOT_FLAGS -I$pilot_incl"
+ break
+ fi
+done
+fi
+
+if test $pilotinclude = no ; then
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: Could not find the pilot-link header files" 1>&2; exit 1; }
+else
+ echo "$ac_t""found at $pilot_incl" 1>&6
+fi
+
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:787: checking for main in -lsocket" >&5
+echo "configure:820: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -791,14 +824,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 795 "configure"
+#line 828 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -819,39 +852,6 @@ else
fi
-pilot_prefix=""
-# Check whether --with-pilot_prefix or --without-pilot_prefix was given.
-if test "${with_pilot_prefix+set}" = set; then
- withval="$with_pilot_prefix"
- :
-fi
-
-
-if test "x$with_pilot_prefix" != "x"; then
- pilot_prefix=$with_pilot_prefix
-fi
-
-echo $ac_n "checking for pilot-link header files""... $ac_c" 1>&6
-echo "configure:836: checking for pilot-link header files" >&5
-pilotinclude=${FORCE_PILOT_INCLUDES:-no}
-if test $pilotinclude = no ; then
-for pilot_incl in $pilot_prefix/include /usr/include /usr/local/include \
- /usr/extra/pilot/include /usr/include/libpisock; do
- if test -r "$pilot_incl/pi-config.h" ; then
- pilotinclude=yes
- PILOT_FLAGS="$PILOT_FLAGS -I$pilot_incl"
- break
- fi
-done
-fi
-
-if test $pilotinclude = no ; then
- echo "$ac_t""no" 1>&6
- { echo "configure: error: Could not find the pilot-link header files" 1>&2; exit 1; }
-else
- echo "$ac_t""found at $pilot_incl" 1>&6
-fi
-
echo $ac_n "checking for pilot library files""... $ac_c" 1>&6
echo "configure:857: checking for pilot library files" >&5
pilotlibs=${FORCE_PILOT_LIBS:-no}
@@ -860,7 +860,7 @@ PILOT_LIBS="-lpisock"
if test $pilotlibs = no ; then
for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
/usr/extra/pilot/lib ; do
- if test -r "$pilot_libs/libpisock.so" ; then
+ if test -r "$pilot_libs/libpisock.a" ; then
pilotlibs=yes
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
break
@@ -934,8 +934,8 @@ echo "configure:927: checking to see if
cat > conftest.$ac_ext <<EOF
#line 936 "configure"
#include "confdefs.h"
-#include "pi-config.h"
- #include "pi-socket.h"
+#include "pi-config.h"
+#include "pi-socket.h"
int main() {
pi_close (0);
; return 0; }

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

@ -1,12 +0,0 @@
$OpenBSD: patch-SyncTime_configure_in,v 1.1.1.1 2001/05/29 00:54:44 pvalchev Exp $
--- SyncTime/configure.in.orig Sun May 27 17:20:36 2001
+++ SyncTime/configure.in Sun May 27 17:20:57 2001
@@ -65,7 +65,7 @@ PILOT_LIBS="-lpisock"
if test $pilotlibs = no ; then
for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
/usr/extra/pilot/lib ; do
- if test -r "$pilot_libs/libpisock.so" ; then
+ if test -r "$pilot_libs/libpisock.a" ; then
pilotlibs=yes
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
break

16
comms/jpilot/patches/patch-aclocal_m4
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/06/03 17:45:01 pvalchev Exp $
--- aclocal.m4.orig Thu Jan 20 12:59:35 2000
+++ aclocal.m4 Sat Jun 2 01:48:15 2001
@@ -461,10 +461,9 @@ AC_DEFUN(AM_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi

96
comms/jpilot/patches/patch-address_c
View File

@ -1,96 +0,0 @@
$OpenBSD: patch-address_c,v 1.1.1.1 2001/05/29 00:54:43 pvalchev Exp $
--- address.c.orig Mon Feb 5 14:30:18 2001
+++ address.c Sun May 27 17:12:01 2001
@@ -30,10 +30,6 @@
#include "libplugin.h"
#include "password.h"
-#include "japanese.h"
-#include "cp1250.h"
-#include "russian.h"
-
#define ADDRESS_EOF 7
static int glob_sort_by_company;
@@ -223,8 +219,16 @@ int pc_address_write(struct Address *a,
unsigned int *unique_id)
{
char record[65536];
- int rec_len;
+ int rec_len,i;
buf_rec br;
+ long char_set;
+
+ get_pref(PREF_CHAR_SET, &char_set, NULL);
+ if (char_set != CHAR_SET_ENGLISH) {
+ for (i = 0; i < 19; i++) {
+ if (a->entry[i]) charset_j2p(a->entry[i], strlen(a->entry[i])+1, char_set);
+ }
+ }
rec_len = pack_Address(a, record, 65535);
if (!rec_len) {
@@ -274,36 +278,22 @@ int get_address_app_info(struct AddressA
return -1;
}
- get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set==CHAR_SET_JAPANESE ||
- char_set==CHAR_SET_1250 ||
- char_set==CHAR_SET_1251 ||
- char_set==CHAR_SET_1251_B
- ) {
+ get_pref(PREF_CHAR_SET, &char_set, NULL);
+ if (char_set != CHAR_SET_ENGLISH) {
/* Convert to character set */
- {
int i;
for (i = 0; i < 16; i++)
if (ai->category.name[i][0] != '\0') {
- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->category.name[i], 16);
- if (char_set==CHAR_SET_1250) Win2Lat(ai->category.name[i], 16);
- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->category.name[i], 16);
+ charset_p2j(ai->category.name[i], 16, char_set);
}
for (i = 0; i < 19 + 3; i++)
if (ai->labels[i][0] != '\0') {
- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->labels[i], 16);
- if (char_set==CHAR_SET_1250) Win2Lat(ai->labels[i], 16);
- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->labels[i], 16);
- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(ai->labels[i], 16);
+ charset_p2j(ai->labels[i],16, char_set);
}
for (i = 0; i < 8; i++)
if (ai->phoneLabels[i][0] != '\0') {
- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(ai->phoneLabels[i], 16);
- if (char_set==CHAR_SET_1250) Win2Lat(ai->phoneLabels[i], 16);
- if (char_set==CHAR_SET_1251) win1251_to_koi8(ai->phoneLabels[i], 16);
- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(ai->phoneLabels[i], 16);
+ charset_p2j(ai->phoneLabels[i],16, char_set);
}
- }
}
return 0;
@@ -385,17 +375,11 @@ int get_addresses2(AddressList **address
}
get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set==CHAR_SET_JAPANESE ||
- char_set==CHAR_SET_1250 ||
- char_set==CHAR_SET_1251 ||
- char_set==CHAR_SET_1251_B
- ) {
- int i;
+ if (char_set != CHAR_SET_ENGLISH) {
for (i = 0; i < 19; i++) {
- if (char_set==CHAR_SET_JAPANESE) Sjis2Euc(a.entry[i], 65536);
- if (char_set==CHAR_SET_1250) Win2Lat(a.entry[i], 65536);
- if (char_set==CHAR_SET_1251) win1251_to_koi8(a.entry[i], 65536);
- if (char_set==CHAR_SET_1251_B) koi8_to_win1251(a.entry[i], 65536);
+ if ((a.entry[i] != NULL) && (a.entry[i][0] != '\0')) {
+ charset_p2j(a.entry[i], strlen(a.entry[i])+1, char_set);
+ }
}
}

44
comms/jpilot/patches/patch-configure.in
View File

@ -1,44 +0,0 @@
--- configure.in.orig Tue Feb 6 12:26:38 2001
+++ configure.in Sun May 27 17:15:16 2001
@@ -109,7 +109,7 @@ PILOT_LIBS="-lpisock"
if test $pilotlibs = no ; then
for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
/usr/extra/pilot/lib ; do
- if test -r "$pilot_libs/libpisock.so" ; then
+ if test -r $pilot_libs/libpisock.so* >/dev/null 2>&1 ; then
pilotlibs=yes
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
break
@@ -174,15 +174,17 @@ AC_ARG_ENABLE(plugins, [ --disable-plug
if test "x$enable_plugins" = "xyes"; then
dnl Check for shared library calls
- AC_MSG_CHECKING(for dlopen)
- save_LIBS="$LIBS"
- LIBS="$LIBS -ldl"
- AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);] , have_dlopen=yes, , )
- LIBS="$save_LIBS"
-
+ AC_CHECK_FUNCS(dlopen)
+ if test "x$ac_cv_func_dlopen" = "xyes"; then
+ have_dlopen=yes
+ else
+ for lib in dl; do
+ AC_CHECK_LIB($lib, dlopen, [LIBS="$LIBS -ldl";
+ have_dlopen=yes; break])
+ done
+ fi
if test "x$have_dlopen" = "xyes"; then
AC_DEFINE(ENABLE_PLUGINS)
- AC_MSG_RESULT(ok, plugin support enabled)
else
AC_MSG_RESULT(Could not find dlopen - not using plugin support)
fi
@@ -232,5 +234,7 @@ fi
AC_OUTPUT([Makefile intl/Makefile po/Makefile.in],
[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+AC_OUTPUT_SUBDIRS(SyncTime)
+AC_OUTPUT_SUBDIRS(Expense)
dnl AC_OUTPUT(Makefile)

119
comms/jpilot/patches/patch-datebook_c
View File

@ -1,119 +0,0 @@
$OpenBSD: patch-datebook_c,v 1.1.1.1 2001/05/29 00:54:44 pvalchev Exp $
--- datebook.c.orig Mon Feb 5 14:30:10 2001
+++ datebook.c Sun May 27 17:12:01 2001
@@ -36,10 +36,6 @@
#include "libplugin.h"
#include "password.h"
-#include "japanese.h"
-#include "cp1250.h"
-#include "russian.h"
-
#ifndef FALSE
#define FALSE 0
#endif
@@ -204,6 +200,13 @@ int pc_datebook_write(struct Appointment
char record[65536];
int rec_len;
buf_rec br;
+ long char_set;
+
+ get_pref(PREF_CHAR_SET, &char_set, NULL);
+ if (char_set != CHAR_SET_ENGLISH) {
+ if (a->description) charset_j2p(a->description, strlen(a->description)+1, char_set);
+ if (a->note) charset_j2p(a->note, strlen(a->note)+1, char_set);
+ }
rec_len = pack_Appointment(a, record, 65535);
if (!rec_len) {
@@ -211,7 +214,7 @@ int pc_datebook_write(struct Appointment
jpilot_logf(LOG_WARN, "pack_Appointment %s\n", _("error"));
return -1;
}
- br.rt=rt;
+ br.rt=rt;
br.attrib = attrib;
br.buf = record;
br.size = rec_len;
@@ -534,9 +537,10 @@ unsigned int isApptOnDate(struct Appoint
int get_datebook_app_info(struct AppointmentAppInfo *ai)
{
- int num;
+ int num,i;
unsigned int rec_size;
unsigned char *buf;
+ long char_set;
bzero(ai, sizeof(*ai));
@@ -549,6 +553,12 @@ int get_datebook_app_info(struct Appoint
jpilot_logf(LOG_WARN, _("Error reading"), "DatebookDB.pdb");
return -1;
}
+ get_pref(PREF_CHAR_SET, &char_set, NULL);
+ if (char_set != CHAR_SET_ENGLISH) {
+ for (i = 0; i < 16; i++) {
+ if (ai->category.name[i][0] != '\0') charset_p2j(ai->category.name[i], 16, char_set);
+ }
+ }
return 0;
}
@@ -687,14 +697,14 @@ int get_days_appointments2(AppointmentLi
AppointmentList *temp_a_list;
long keep_modified, keep_deleted;
int keep_priv;
- long char_set;
buf_rec *br;
#ifdef USE_DB3
long use_db3_tags;
time_t ltime;
struct tm *today;
#endif
-
+ long char_set;
+
#ifdef USE_DB3
time(&ltime);
today = localtime(&ltime);
@@ -762,22 +772,8 @@ int get_days_appointments2(AppointmentLi
}
get_pref(PREF_CHAR_SET, &char_set, NULL);
- if (char_set==CHAR_SET_JAPANESE) {
- Sjis2Euc(a.description, 65536);
- Sjis2Euc(a.note, 65536);
- }
- if (char_set==CHAR_SET_1250) {
- Win2Lat(a.description, 65536);
- Win2Lat(a.note, 65536);
- }
- if (char_set==CHAR_SET_1251) {
- win1251_to_koi8(a.description, 65536);
- win1251_to_koi8(a.note, 65536);
- }
- if (char_set==CHAR_SET_1251_B) {
- koi8_to_win1251(a.description, 65536);
- koi8_to_win1251(a.note, 65536);
- }
+ if (a.description) charset_p2j(a.description, strlen(a.description)+1, char_set);
+ if (a.note) charset_p2j(a.note, strlen(a.note)+1, char_set);
temp_a_list = malloc(sizeof(AppointmentList));
if (!temp_a_list) {
@@ -792,6 +788,8 @@ int get_days_appointments2(AppointmentLi
temp_a_list->next = *appointment_list;
*appointment_list = temp_a_list;
recs_returned++;
+
+
}
jp_free_DB_records(&records);
@@ -802,3 +800,5 @@ int get_days_appointments2(AppointmentLi
return recs_returned;
}
+
+

46
comms/jpilot/patches/patch-datebook_gui_c
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-datebook_gui_c,v 1.1.1.1 2001/05/29 00:54:44 pvalchev Exp $
--- datebook_gui.c.orig Mon Feb 5 14:30:04 2001
+++ datebook_gui.c Sun May 27 17:12:01 2001
@@ -223,7 +223,6 @@ static void cb_toggle(GtkWidget *widget,
void cb_date_cats(GtkWidget *widget, gpointer data)
{
- unsigned char *buf;
int size;
struct AppointmentAppInfo ai;
int i;
@@ -240,13 +239,7 @@ void cb_date_cats(GtkWidget *widget, gpo
return;
}
- get_app_info("DatebookDB", &buf, &size);
- jpilot_logf(LOG_DEBUG, "Got datebook app info, size = %d", size);
- if (size<1) {
- return;
- }
- unpack_AppointmentAppInfo(&ai, buf, size);
- free(buf);
+ get_datebook_app_info(&ai);
window_date_cats = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -267,10 +260,8 @@ void cb_date_cats(GtkWidget *widget, gpo
gtk_table_set_col_spacings(GTK_TABLE(table),0);
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
- get_pref(PREF_CHAR_SET, &char_set, NULL);
for (i=0, bit=1; i<16; i++, bit <<= 1) {
if (ai.category.name[i][0]) {
- if (char_set == CHAR_SET_JAPANESE) Sjis2Euc(ai.category.name[i], 65536);
toggle_button[i]=gtk_toggle_button_new_with_label
(ai.category.name[i]);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_button[i]),
@@ -944,7 +935,7 @@ static int get_details(struct Appointmen
if (a->note) {
jpilot_logf(LOG_DEBUG, "text2=[%s]\n",a->note);
}
-
+
/* We won't allow a repeat frequency of less than 1 */
if ((page != PAGE_NONE) && (a->repeatFrequency < 1)) {
jpilot_logf(LOG_WARN,

154
comms/jpilot/patches/patch-japanese_c
View File

@ -1,154 +0,0 @@
$OpenBSD: patch-japanese_c,v 1.1.1.1 2001/05/29 00:54:44 pvalchev Exp $
--- japanese.c.orig Wed Jan 31 09:51:33 2001
+++ japanese.c Sun May 27 17:12:01 2001
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <stdio.h>
-
+
/* In utils.c, also a prototype in utils.h */
void multibyte_safe_strncpy(char *dst, char *src, size_t max_len);
@@ -23,7 +23,14 @@ void multibyte_safe_strncpy(char *dst, c
#define isEuc(c) \
(0xa0 < ((unsigned char) (c)) && ((unsigned char) (c)) < 0xff)
+/* convert SJIS char to EUC char
+
+ this does not support Machine dependent codes.
+ args: hi: first byte of sjis char.
+ lo: second byte of sjis char.
+ return: euc char in 16bit value.
+ */
static unsigned int SjisToEuc(unsigned char hi, unsigned char lo)
{
if (lo >= 0x9f)
@@ -33,7 +40,11 @@ static unsigned int SjisToEuc(unsigned c
(lo + (lo >= 0x7f ? 0x60 : 0x61));
}
-
+/*
+ args: source char pointer, destination source pointer, a length of srting
+ Length include null termination.
+ return the pointer of nul termination code.
+ */
unsigned char *Sjis2EucCpy(unsigned char *dest, unsigned char *src, int max_len)
{
unsigned char *p, *q;
@@ -43,8 +54,8 @@ unsigned char *Sjis2EucCpy(unsigned char
p = src;
q = dest;
- while ((*p) && (n < max_len-1)) {
- if (isSjis1stByte(*p)) {
+ while ((*p) && (n < max_len-2)) {
+ if (isSjis1stByte(*p)) {
hi = *p++;
lo = *p++;
w = SjisToEuc(hi, lo);
@@ -58,27 +69,48 @@ unsigned char *Sjis2EucCpy(unsigned char
} else if ((*p) & 0x80) { /* irregular japanese char */
p++; /* ??abort and return NULL?? */
/* discard it */
- } else {
+ } else {
*q++ = *p++;
n++;
}
}
- *q = '\0';
- return dest;
+ if ((*p) && !(*p & 0x80) && (n < max_len-1)) {
+ *q++ = *p++;
+ *q = '\0';
+ } else {
+ *q = '\0';
+ }
+ return q;
}
+/*
+ convert strings from Sjis to EUC.
+ max_len includes null termiantion.
+ size of buf must be more than max_len.
+
+*/
+
void Sjis2Euc(unsigned char *buf, int max_len)
{
unsigned char *dst;
if (buf == NULL) return;
- if ((dst = (unsigned char *)malloc(max_len*2)) != NULL) {
- if (Sjis2EucCpy(dst, buf, max_len*2) != NULL)
+ if ((dst = (unsigned char *)malloc(max_len)) != NULL) {
+ /* assign buffer for destination. */
+ if (Sjis2EucCpy(dst, buf, max_len) != NULL) {
multibyte_safe_strncpy(buf, dst, max_len);
+ buf[max_len-1] = '\0'; /* i am a paranoire B-) */
+ }
free(dst);
- }
+ }
}
+/*
+ Convert one char from euc to sjis.
+ args: hi: first byte of euc code.
+ lo: second byte of euc code.
+ return: 16bit value of sjis char code.
+ */
static unsigned int EucToSjis(unsigned char hi, unsigned char lo)
{
if (hi & 1)
@@ -88,6 +120,11 @@ static unsigned int EucToSjis(unsigned c
return ((hi / 2 + (hi < 0xdf ? 0x30 : 0x70)) << 8) | (lo - 2);
}
+/*
+ Convert string from euc to sjis with coping to another buffer.
+ Theoritically, strlen(EUC) >= strlen(SJIS),
+ then it is ok that dest == src.
+ */
unsigned char *Euc2SjisCpy(unsigned char *dest, unsigned char *src, int max_len)
{
unsigned char *p, *q;
@@ -97,7 +134,7 @@ unsigned char *Euc2SjisCpy(unsigned char
p = src;
q = dest;
- while ((*p) && (n < max_len-1)) {
+ while ((*p) && (n < max_len-2)) {
if (isEucKana(*p)) { /* euc kana(2byte) -> sjis(1byte) */
p++;
*q++ = *p++;
@@ -114,12 +151,24 @@ unsigned char *Euc2SjisCpy(unsigned char
n++;
}
}
- *q = '\0';
+ if ((*p) && !(*p & 0x80) && n < max_len-1) {
+ *q++ = *p++;
+ *q = '\0';
+ } else {
+ *q = '\0';
+ }
return dest;
}
+/*
+ convert euc to sjis.
+ size of buf must be more than man_len.
+ it simply call Euc2SjisCpy().
+ this function exists for symmetry.
+ */
void Euc2Sjis(unsigned char *buf, int max_len)
{
if (buf == NULL) return;
- Euc2SjisCpy(buf, buf, max_len);
+ if (max_len <= 0) return;
+ (void *)Euc2SjisCpy(buf, buf, max_len);
}