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

Take over port maintainership, ho@ agreed.

Browse Source 
o Fix dynamic loading - prefix an underscore in symbol names for our a.out
platforms in order for dlsym() to work, hence plugins can be loaded.
o Build Expense plugin.
o Build synctime plugin.
o Install more documentation, rearrage Makefile, bump package name.
This commit is contained in:
pvalchev 2001-05-29 01:00:45 +00:00
parent 3cd9cb8661
commit 3d1e9f8dcc
6 changed files with 95 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
comms/jpilot/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.12 2001/05/05 22:39:51 jakob Exp $
# $OpenBSD: Makefile,v 1.13 2001/05/29 01:00:45 pvalchev Exp $
COMMENT= "desktop organizer software for the Palm Pilot"
COMMENT= "desktop organizer software for the palm pilot"
DISTNAME= jpilot-0.99
DISTNAME= jpilot-0.99p1
CATEGORIES= comms
NEED_VERSION= 1.406
MASTER_SITES= http://www.jpilot.org/
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://www.jpilot.org/
MAINTAINER= Hakan Olsson <ho@openbsd.org>
MAINTAINER= Peter Valchev <pvalchev@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -20,11 +20,12 @@ PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= pisock.3::comms/pilot-link \
gtk.1.2::x11/gtk+
USE_X11= yes
USE_X11= Yes
CONFIGURE_STYLE= autoconf
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>

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

@ -1,22 +1,42 @@
--- Makefile.in.orig Thu Mar 2 03:00:14 2000
+++ Makefile.in Sat Apr 8 12:32:01 2000
@@ -10,7 +10,7 @@
--- Makefile.in.orig Tue Feb 6 12:31:05 2001
+++ Makefile.in Sun May 27 17:15:52 2001
@@ -10,7 +10,7 @@ top_builddir = @top_srcdir@
SUBDIRS = @INTLSUB@ @POSUB@
# Install variables
-prefix=@prefix@
+prefix=${PREFIX}
datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale
--- po/Makefile.in.in.orig Thu Jun 24 08:07:56 1999
+++ po/Makefile.in.in Sat Apr 8 12:32:21 2000
@@ -16,7 +16,7 @@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
+prefix = ${PREFIX}
exec_prefix = @exec_prefix@
datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale
@@ -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/*

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

@ -1,7 +1,7 @@
--- configure.in.orig Tue Nov 2 00:01:45 1999
+++ configure.in Fri Dec 31 03:19:55 1999
@@ -60,7 +60,7 @@
--- 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
@ -9,7 +9,7 @@
pilotlibs=yes
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
break
@@ -114,15 +114,17 @@
@@ -174,15 +174,17 @@ AC_ARG_ENABLE(plugins, [ --disable-plug
if test "x$enable_plugins" = "xyes"; then
dnl Check for shared library calls
@ -34,3 +34,11 @@
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)

16
comms/jpilot/patches/patch-plugins.c
View File

@ -1,6 +1,6 @@
--- plugins.c.orig Mon Feb 5 22:31:57 2001
+++ plugins.c Fri Feb 23 17:04:14 2001
@@ -231,7 +231,7 @@
--- plugins.c.orig Mon Feb 5 14:31:57 2001
+++ plugins.c Sun May 27 17:50:15 2001
@@ -231,7 +231,7 @@ static int get_plugin_info(struct plugin
p->plugin_post_sync = NULL;
p->plugin_exit_cleanup = NULL;
@ -9,3 +9,13 @@
if (!h) {
jpilot_logf(LOG_WARN, "open failed on plugin [%s]\n error [%s]\n", path,
dlerror());
@@ -243,6 +243,9 @@ static int get_plugin_info(struct plugin
p->full_path = strdup(path);
/* plugin_versionM */
+#if defined __OpenBSD__ && !defined __ELF__
+#define dlsym(x,y) dlsym(x, "_" y)
+#endif
plugin_versionM = dlsym(h, "plugin_version");
if (plugin_versionM==NULL) {
err = dlerror();

3
comms/jpilot/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2001/05/29 01:00:47 pvalchev Exp $
lib/jpilot/plugins/libexpense.so
lib/jpilot/plugins/libsynctime.so

26
comms/jpilot/pkg/PLIST
View File

@ -1,4 +1,14 @@
@comment $OpenBSD: PLIST,v 1.2 2001/05/29 01:00:47 pvalchev Exp $
bin/jpilot
bin/jpilot-dump
bin/jpilot-sync
bin/jpilot-upgrade-99
lib/jpilot/plugins/libexpense.a
lib/jpilot/plugins/libexpense.la
lib/jpilot/plugins/libsynctime.a
lib/jpilot/plugins/libsynctime.la
share/doc/jpilot/manual.html
share/doc/jpilot/plugin.html
share/jpilot/AddressDB.pdb
share/jpilot/DatebookDB.pdb
share/jpilot/MemoDB.pdb
@ -8,6 +18,18 @@ share/jpilot/jpilotrc.default
share/jpilot/jpilotrc.green
share/jpilot/jpilotrc.purple
share/jpilot/jpilotrc.steel
share/doc/jpilot/plugin.html
@dirrm share/doc/jpilot
share/locale/ca/LC_MESSAGES/jpilot.mo
share/locale/cs/LC_MESSAGES/jpilot.mo
share/locale/da/LC_MESSAGES/jpilot.mo
share/locale/de/LC_MESSAGES/jpilot.mo
share/locale/es/LC_MESSAGES/jpilot.mo
share/locale/fr/LC_MESSAGES/jpilot.mo
share/locale/ja/LC_MESSAGES/jpilot.mo
share/locale/nl/LC_MESSAGES/jpilot.mo
share/locale/no/LC_MESSAGES/jpilot.mo
share/locale/sv/LC_MESSAGES/jpilot.mo
%%SHARED%%
@dirrm share/jpilot
@dirrm share/doc/jpilot
@dirrm lib/jpilot/plugins
@dirrm lib/jpilot