summaryrefslogtreecommitdiff
path: root/comms/pilot-link
diff options
context:
space:
mode:
authorjlam <jlam>2001-06-27 18:04:38 +0000
committerjlam <jlam>2001-06-27 18:04:38 +0000
commitdd55d73f55d88eac9f080cd3a755834f1f3ce41b (patch)
tree5771614c8cb34926567094a4a44fddd3fc55548a /comms/pilot-link
parent12d6b0b6f163acece2e74f3a95eb81c5b06eb462 (diff)
downloadpkgsrc-dd55d73f55d88eac9f080cd3a755834f1f3ce41b.tar.gz
Update pilot-link to 0.9.5. The source code is under new stewardship
and is undergoing many improvements and rewrites, many of which are reflected in the current release. The ChangeLog is too large to summarize. The libraries and headers have been split off into a separate package pilot-link-libs.
Diffstat (limited to 'comms/pilot-link')
-rw-r--r--comms/pilot-link/Makefile28
-rw-r--r--comms/pilot-link/Makefile.common31
-rw-r--r--comms/pilot-link/buildlink.mk34
-rw-r--r--comms/pilot-link/distinfo10
-rw-r--r--comms/pilot-link/patches/patch-aa16
-rw-r--r--comms/pilot-link/patches/patch-ab114
-rw-r--r--comms/pilot-link/patches/patch-ac32
-rw-r--r--comms/pilot-link/pkg/PLIST47
8 files changed, 204 insertions, 108 deletions
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index b7a4a43814f..70745209c05 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,20 +1,28 @@
-# $NetBSD: Makefile,v 1.23 2001/06/22 05:25:46 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/06/27 18:04:38 jlam Exp $
#
-DISTNAME= pilot-link.0.9.3
-PKGNAME= pilot-link-0.9.3
-CATEGORIES= comms
-MASTER_SITES= http://www.gnu-designs.com/pilot-link/source/
+.include "../../comms/pilot-link/Makefile.common"
-MAINTAINER= sommerfeld@alum.mit.edu
-HOMEPAGE= http://www.gnu-designs.com/pilot-link/
+PKGNAME= pilot-link-${PILOT_LINK_VERS}
COMMENT= Tools to talk to the 3Com Pilot PDA
+BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
+
USE_BUILDLINK_ONLY= # defined
USE_PERL5= # defined
-GNU_CONFIGURE= # defined
+USE_GNU_READLINE= # defined
+
+CONFIGURE_ARGS+= --with-perl5=${PERL5}
+CONFIGURE_ARGS+= --with-readline21
+CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-tk=${BUILDLINK_DIR}
+
+LIBS+= -lpisock -liconv
-USE_LIBTOOL= # defined
-LTCONFIG_OVERRIDE= ${WRKSRC}/scripts/ltconfig
+INSTALL_TARGET= install-execs install-man
+.include "../../comms/pilot-link-libs/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../lang/tcl/buildlink.mk"
+.include "../../x11/tk/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilot-link/Makefile.common b/comms/pilot-link/Makefile.common
new file mode 100644
index 00000000000..5e8763e3c01
--- /dev/null
+++ b/comms/pilot-link/Makefile.common
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile.common,v 1.1 2001/06/27 18:04:38 jlam Exp $
+
+DISTNAME= pilot-link.${PILOT_LINK_VERS}
+CATEGORIES= comms
+MASTER_SITES= http://www.gnu-designs.com/pilot-link/source/
+EXTRACT_SUFX= .tar.bz2
+
+PILOT_LINK_VERS= 0.9.5
+
+MAINTAINER= jlam@netbsd.org
+HOMEPAGE= http://www.gnu-designs.com/pilot-link/
+
+USE_LIBTOOL= # defined
+LTCONFIG_OVERRIDE= ${WRKSRC}/scripts/ltconfig
+
+GNU_CONFIGURE= # defined
+
+CONFIGURE_ARGS+= --with-cpp
+CONFIGURE_ARGS+= --with-libiconv
+
+CONFIGURE_ARGS+= --without-java
+CONFIGURE_ARGS+= --without-itcl
+CONFIGURE_ARGS+= --without-perl5
+CONFIGURE_ARGS+= --without-python
+CONFIGURE_ARGS+= --without-readline21
+CONFIGURE_ARGS+= --without-readline20
+CONFIGURE_ARGS+= --without-tcl
+CONFIGURE_ARGS+= --without-tk
+
+DISTINFO_FILE= ${.CURDIR}/../../comms/pilot-link/distinfo
+PATCHDIR= ${.CURDIR}/../../comms/pilot-link/patches
diff --git a/comms/pilot-link/buildlink.mk b/comms/pilot-link/buildlink.mk
deleted file mode 100644
index 57184fd657d..00000000000
--- a/comms/pilot-link/buildlink.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:50 jlam Exp $
-#
-# This Makefile fragment is included by packages that use pilot-link.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.pilot-link to the dependency pattern
-# for the version of pilot-link desired.
-# (2) Include this Makefile fragment in the package Makefile,
-# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
-# search path, and
-# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
-# path.
-
-.if !defined(PILOT_LINK_BUILDLINK_MK)
-PILOT_LINK_BUILDLINK_MK= # defined
-
-BUILDLINK_DEPENDS.pilot-link?= pilot-link>=0.9.3
-DEPENDS+= ${BUILDLINK_DEPENDS.pilot-link}:../../comms/pilot-link
-
-BUILDLINK_PREFIX.pilot-link= ${LOCALBASE}
-BUILDLINK_FILES.pilot-link= include/pi-*.*
-BUILDLINK_FILES.pilot-link+= lib/libpicc.*
-BUILDLINK_FILES.pilot-link+= lib/libpisock.*
-
-BUILDLINK_TARGETS.pilot-link= pilot-link-buildlink
-BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.pilot-link}
-
-pre-configure: ${BUILDLINK_TARGETS.pilot-link}
-pilot-link-buildlink: _BUILDLINK_USE
-
-.include "../../mk/bsd.buildlink.mk"
-
-.endif # PILOT_LINK_BUILDLINK_MK
diff --git a/comms/pilot-link/distinfo b/comms/pilot-link/distinfo
index 87715a04439..d79b85da6e3 100644
--- a/comms/pilot-link/distinfo
+++ b/comms/pilot-link/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/04/22 10:45:05 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/06/27 18:04:39 jlam Exp $
-SHA1 (pilot-link.0.9.3.tar.gz) = 2face9a3ff50180709722dfe8896e469f2877068
-Size (pilot-link.0.9.3.tar.gz) = 460174 bytes
-SHA1 (patch-ab) = 87e94eb2f97dc90ff8b21f360f7681beb277d3c7
+SHA1 (pilot-link.0.9.5.tar.bz2) = cb026637bebad22a273b38edfd8633853d13e065
+Size (pilot-link.0.9.5.tar.bz2) = 424794 bytes
+SHA1 (patch-aa) = d2cb12eac0e85c2b039781eaed14b5ef75ff0c34
+SHA1 (patch-ab) = 098d934009c87949a4d6f3dbaed78c9803df1029
+SHA1 (patch-ac) = 5d37048f9524e8d96b387c4ee22b4f91d4d4b6d7
diff --git a/comms/pilot-link/patches/patch-aa b/comms/pilot-link/patches/patch-aa
new file mode 100644
index 00000000000..326e325e9d8
--- /dev/null
+++ b/comms/pilot-link/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.4 2001/06/27 18:04:39 jlam Exp $
+
+--- configure.orig Mon Mar 12 23:06:17 2001
++++ configure
+@@ -2964,9 +2964,9 @@
+ WITHTK='WITHTK'
+ if test "x$TK_INC" = "x$TCL_INC"; then
+ TK_INC=" #same as TCL_INC"
+- TCLTKFLAGS="-DTCL -DTK $TCL_INC $DEBIANTCL"
++ TCLTKFLAGS="-DTCL -DTK -I${X11BASE}/include"
+ else
+- TCLTKFLAGS="-DTCL -DTK $TCL_INC $DEBIANTCL $TK_INC"
++ TCLTKFLAGS="-DTCL -DTK -I${X11BASE}/include"
+ fi
+ fi
+ fi
diff --git a/comms/pilot-link/patches/patch-ab b/comms/pilot-link/patches/patch-ab
index 17f3b40b10a..8fb0552df51 100644
--- a/comms/pilot-link/patches/patch-ab
+++ b/comms/pilot-link/patches/patch-ab
@@ -1,33 +1,113 @@
-$NetBSD: patch-ab,v 1.4 1999/05/20 20:37:50 tron Exp $
+$NetBSD: patch-ab,v 1.5 2001/06/27 18:04:39 jlam Exp $
---- Makefile.in.orig Mon Aug 24 09:16:08 1998
-+++ Makefile.in Thu May 20 22:21:44 1999
-@@ -44,7 +44,7 @@
- libcclib = @libcclib@
- cclib = @cclib@
+--- Makefile.in.orig Tue Jun 19 12:25:29 2001
++++ Makefile.in
+@@ -34,8 +34,8 @@
+ CXX = @CXX@
+ CDEFS = -DLIBDIR=\"$(libdir)\"
+ # -DDEBUG
+-CFLAGS = -I./include -I$(srcdir)/include @CFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
+-CXXFLAGS = -I./include -I$(srcdir)/include @CXXFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
++CFLAGS = @CFLAGS@ -I./include -I$(srcdir)/include @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
++CXXFLAGS = @CXXFLAGS@ -I./include -I$(srcdir)/include @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ # -lefence
+@@ -47,7 +47,7 @@
+ LANGS = Perl5 Java Tcl Python
+ SUBDIRS = tools
-INSTALL = $(LIBTOOL) @INSTALL@
+INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
YACC = @YACC@
-@@ -112,12 +112,15 @@
- $(SHELL) ${srcdir}/scripts/mkinstalldirs $(bindir) $(includedir) $(libdir) $(pixdir) $(mandir1) $(mandir7)
+@@ -103,44 +103,52 @@
- install: $(EXECS) installdirs $(PILIB) $(PICCLIB)
+ EXECS = $(CEXECS) $(@WITHTCL@) $(@WITHCXX@) $(@WITHPERL5@)
+
+-PILIB = libsock/libpisock.la
+-PICCLIB = @libcclib@
++#PILIB = libsock/libpisock.la
++#PICCLIB = @libcclib@
+
+ all: $(EXECS)
+
+-$(PILIB): FORCE
++libs: libsock/libpisock.la libcc/libpicc.a
++
++libsock/libpisock.la: FORCE
+ $(SUBMAKE_COMM) libpisock.la
+
+ libcc/libpicc.a: FORCE
+ $(SUBMAKE_COMM_CC) libpicc.a
+
+-installdirs:
+- $(SHELL) ${srcdir}/scripts/mkinstalldirs $(bindir) $(includedir) $(libdir) $(pixdir) $(mandir1) $(mandir7)
++install: install-libs install-execs install-man
+
+-install: $(EXECS) installdirs $(PILIB) $(PICCLIB)
- $(INSTALL_DATA) $(PILIB) $(libdir)/libpisock.la
-+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(PILIB) $(libdir)/libpisock.la
++install-libs: $(PILIB) $(PICCLIB)
++ $(SHELL) ${srcdir}/scripts/mkinstalldirs $(includedir) $(libdir)
++ for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \
++ $(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
++ done
++ $(LIBTOOL) $(INSTALL_DATA) $(PILIB) $(libdir)/libpisock.la
if test -n "$(PICCLIB)"; then \
- $(INSTALL_DATA) $(PICCLIB) $(libdir)/libpicc.la; \
-+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(PICCLIB) $(libdir)/libpicc.la; \
++ $(INSTALL_DATA) $(PICCLIB) $(libdir)/libpicc.a; \
fi
+- for p in $(CEXECS); do \
+- $(STRIP) ".libs/$$p"; \
+- done
- for p in $(EXECS); do \
- $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
-+ for p in $(CEXECS) ${CXXEXECS}; do \
-+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
++ $(LIBTOOL) -n --finish $(libdir)
++
++install-execs: $(EXECS)
++ $(SHELL) ${srcdir}/scripts/mkinstalldirs $(bindir) $(pixdir)
++ for p in $(CEXECS) $(@WITHTCL@) $(@WITHCXX@); do \
++ $(LIBTOOL) $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
+ done
+- for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \
+- $(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
++ for p in $(@WITHPERL5@); do \
++ ${BSD_INSTALL_SCRIPT} $$p $(bindir)/$$p; \
+ done
++ for p in $(srcdir)/tools/pix/*.gif $(srcdir)/tools/pix/*.xbm; do \
++ $(INSTALL_DATA) $$p $(pixdir)/`basename $$p`; \
+ done
-+ for p in $(PERLEXECS); do \
-+ $(BSD_INSTALL_SCRIPT) $$p $(bindir)/$$p; \
++
++install-man:
++ $(SHELL) ${srcdir}/scripts/mkinstalldirs $(mandir1) $(mandir7)
+ for m in ${srcdir}/man/*.1; do \
+ $(INSTALL_DATA) $$m $(mandir1)/`basename $$m`; \
+ done
+ for m in ${srcdir}/man/*.7; do \
+ $(INSTALL_DATA) $$m $(mandir7)/`basename $$m`; \
done
- for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \
- $(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
+- for p in $(srcdir)/tools/pix/*.gif $(srcdir)/tools/pix/*.xbm; do \
+- $(INSTALL_DATA) $$p $(pixdir)/`basename $$p`; \
+- done
+- $(LIBTOOL) -n --finish $(libdir)
+
+ uninstall:
+ -for p in $(EXECS) $(PERLEXECS) $(CXXEXECS) $(TCLEXECS); do \
+@@ -243,13 +251,13 @@
+ $(CCLINK) pi-nredir.o $(PILIB) $(GETOPT) -o $@ $(LIBS)
+
+ ccexample$(EXT): $(PILIB) $(GETOPT) $(PICCLIB) ccexample.o
+- $(CXXLINK) ccexample.o $(PILIB) $(GETOPT) $(PICCLIB) -o $@ $(CXXLIBS) $(LIBS)
++ $(CXXLINK) ccexample.o $(PILIB) $(GETOPT) -lpicc -o $@ $(CXXLIBS) $(LIBS)
+
+ validate$(EXT): $(PILIB) $(GETOPT) $(PICCLIB) validate.o
+- $(CXXLINK) validate.o $(PILIB) $(GETOPT) $(PICCLIB) -o $@ $(CXXLIBS) $(LIBS)
++ $(CXXLINK) validate.o $(PILIB) $(GETOPT) -lpicc -o $@ $(CXXLIBS) $(LIBS)
+
+ iambicexample$(EXT): $(PILIB) $(GETOPT) $(PICCLIB) iambicexample.o
+- $(CXXLINK) iambicexample.o $(PILIB) $(GETOPT) $(PICCLIB) -o $@ $(CXXLIBS) $(LIBS)
++ $(CXXLINK) iambicexample.o $(PILIB) $(GETOPT) -lpicc -o $@ $(CXXLIBS) $(LIBS)
+
+ getrom$(EXT): $(PILIB) $(GETOPT) getrom.o
+ $(CCLINK) getrom.o $(PILIB) $(GETOPT) -o $@ $(LIBS)
diff --git a/comms/pilot-link/patches/patch-ac b/comms/pilot-link/patches/patch-ac
new file mode 100644
index 00000000000..bacb48e59fa
--- /dev/null
+++ b/comms/pilot-link/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1 2001/06/27 18:04:39 jlam Exp $
+
+--- libsock/Makefile.in.orig Tue Jun 19 12:25:26 2001
++++ libsock/Makefile.in
+@@ -25,7 +25,7 @@
+ top_builddir = ..
+
+ CC = @CC@
+-CFLAGS = -I../include -I$(srcdir)/../include @CFLAGS@ @CWFLAG@
++CFLAGS = -I../include -I$(srcdir)/../include @CFLAGS@ @CWFLAG@ $(ICONV_CFLAGS)
+ # -DPADP_TRACE
+ # -DDEBUG
+ # -DNO_DLP_TRACE
+@@ -36,6 +36,9 @@
+ RM = rm -f
+ LIBTOOL = @LIBTOOL@
+
++ICONV_CFLAGS = @ICONV_CFLAGS@
++ICONV_LIBS = @ICONV_LIBS@
++
+ .SUFFIXES: .c .lo .o
+
+ .c.o:
+@@ -54,7 +57,7 @@
+ libpisock.la: $(OBJS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) \
+ -export-dynamic -rpath $(libdir) -version-info 4:0:0 \
+- -o libpisock.la $(OBJS)
++ -o libpisock.la $(OBJS) $(LDFLAGS) $(ICONV_LIBS)
+
+ # OS/2 dll build rules, This is somewhat of a hack.
+ # This target creates the OS/2 linker .def file dynanmically.
diff --git a/comms/pilot-link/pkg/PLIST b/comms/pilot-link/pkg/PLIST
index ca746ea829f..154dee98263 100644
--- a/comms/pilot-link/pkg/PLIST
+++ b/comms/pilot-link/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:22 agc Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/06/27 18:04:39 jlam Exp $
bin/addresses
bin/ccexample
bin/debugsh
@@ -21,9 +21,11 @@ bin/pi-nredir
bin/pi-port
bin/pilot-addresses
bin/pilot-clip
+bin/pilot-debug
bin/pilot-dedupe
bin/pilot-file
bin/pilot-mail
+bin/pilot-prc
bin/pilot-schlep
bin/pilot-undelete
bin/pilot-xfer
@@ -32,48 +34,6 @@ bin/read-ical
bin/read-todos
bin/reminders
bin/sync-plan
-include/pi-address.h
-include/pi-address.hxx
-include/pi-appinfo.h
-include/pi-appinfo.hxx
-include/pi-args.h
-include/pi-cmp.h
-include/pi-config-win32.h
-include/pi-config.h
-include/pi-datebook.h
-include/pi-datebook.hxx
-include/pi-dlp.h
-include/pi-dlp.hxx
-include/pi-expense.h
-include/pi-file.h
-include/pi-hinote.h
-include/pi-iambicExpense.h
-include/pi-iambicExpense.hxx
-include/pi-inet.h
-include/pi-inetserial.h
-include/pi-macros.h
-include/pi-mail.h
-include/pi-memo.h
-include/pi-memo.hxx
-include/pi-money.h
-include/pi-padp.h
-include/pi-serial.h
-include/pi-slp.h
-include/pi-sockaddr-win32.h
-include/pi-sockaddr.h
-include/pi-socket.h
-include/pi-source.h
-include/pi-sync.h
-include/pi-syspkt.h
-include/pi-todo.h
-include/pi-todo.hxx
-include/pi-version.h
-lib/libpicc.a
-lib/libpisock.a
-lib/libpisock.la
-lib/libpisock.so
-lib/libpisock.so.3
-lib/libpisock.so.3.1
lib/pix/b1.gif
lib/pix/b2.gif
lib/pix/b3.gif
@@ -90,6 +50,7 @@ man/man1/install-datebook.1
man/man1/install-hinote.1
man/man1/install-memo.1
man/man1/install-user.1
+man/man1/pilot-addresses.1
man/man1/pilot-xfer.1
man/man1/read-ical.1
man/man7/pilot-link.7