updated to v0.3.2

This commit is contained in:
jakob 1999-09-23 21:33:47 +00:00
parent 19d95746e7
commit 9c065551d5
6 changed files with 43 additions and 190 deletions

View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.1.1.1 1999/06/26 16:40:38 jakob Exp $
# $OpenBSD: Makefile,v 1.2 1999/09/23 21:35:22 jakob Exp $
DISTNAME= pi-address-0.3.1
PKGNAME= pi-address-0.3.1
DISTNAME= pi-address-0.3.2
CATEGORIES= misc x11
MAINTAINER= jakob@openbsd.org

View File

@ -1,3 +1,3 @@
MD5 (pi-address-0.3.1.tar.gz) = de970dcc7bb30837af6d9afa996a2146
RMD160 (pi-address-0.3.1.tar.gz) = e421455c05a2395003f53c0bcabb0055d0a8452b
SHA1 (pi-address-0.3.1.tar.gz) = 274c5278ab61a79243a49d3c7f201bd11e69046c
MD5 (pi-address-0.3.2.tar.gz) = 2a734bc0171120a86afbae4830cee29c
RMD160 (pi-address-0.3.2.tar.gz) = 1722aef90e89b7028c18dd90a765ae073dbe1cde
SHA1 (pi-address-0.3.2.tar.gz) = 2c9102741eec3e6e49c4f931d772925690ae2fcb

View File

@ -1,64 +1,38 @@
*** Makefile.orig Wed Mar 31 19:11:01 1999
--- Makefile Sat Jun 26 18:05:44 1999
***************
*** 2,18 ****
XINCLUDE= /usr/X11R6/include
# for Solaris use this instead
# XINCLUDE=/usr/openwin/include
! INCDIRS= -I$(XINCLUDE) -I$(QTDIR)/include -I$(PILOT_LINK)/include
CFLAGS = -g -O2
# uncommment the following line if you have linking errors on Solaris
# LFLAGS_ADD = /usr/lib/libnsl.so /usr/lib/libsocket.so
# LFLAGS = $(LFLAGS_ADD) $(QTDIR)/lib/libqt.so $(PILOT_LINK)/lib/libpisock.a
! LFLAGS = $(LFLAGS_ADD) -L$(QTDIR)/lib -lqt $(PILOT_LINK)/lib/libpisock.a
# try this one if you want to link against the shared library from pilot-link
! # LFLAGS = $(LFLAGS_ADD) -L$(QTDIR)/lib -lqt -L$(PILOT_LINK)/lib -lpisock
# uncomment the following line on HP-UX
# LFLAGS += -lX11 -lXext
--- 2,18 ----
XINCLUDE= /usr/X11R6/include
# for Solaris use this instead
# XINCLUDE=/usr/openwin/include
! INCDIRS= -I$(XINCLUDE) -I$(QTDIR)/include/X11/qt -I$(PILOT_LINK)/include
CFLAGS = -g -O2
# uncommment the following line if you have linking errors on Solaris
# LFLAGS_ADD = /usr/lib/libnsl.so /usr/lib/libsocket.so
# LFLAGS = $(LFLAGS_ADD) $(QTDIR)/lib/libqt.so $(PILOT_LINK)/lib/libpisock.a
! # LFLAGS = $(LFLAGS_ADD) -L$(QTDIR)/lib -lqt $(PILOT_LINK)/lib/libpisock.a
# try this one if you want to link against the shared library from pilot-link
! LFLAGS = $(LFLAGS_ADD) -L$(QTDIR)/lib -lqt -L$(PILOT_LINK)/lib -lpisock
# uncomment the following line on HP-UX
# LFLAGS += -lX11 -lXext
***************
*** 31,41 ****
RM_OPT = -f
# Edited for Debian GNU/Linux
! DESTDIR =
! prefix = $(DESTDIR)/usr/X11R6
! doc_prefix = $(DESTDIR)/usr/doc
! conf_prefix = $(DESTDIR)/etc
####### Files
--- 31,41 ----
RM_OPT = -f
# Edited for Debian GNU/Linux
! DESTDIR = $(LOCALBASE)
! prefix = $(DESTDIR)
! doc_prefix = $(DESTDIR)/share/doc
! conf_prefix = $(doc_prefix)/$(TARGET)
####### Files
--- Makefile.orig Fri Sep 3 19:20:04 1999
+++ Makefile Thu Sep 23 23:25:31 1999
@@ -5,7 +5,7 @@
# be sure to set all include directories to correct values
# (especially the directory for the pilot-link and Qt include files)
-INCDIRS= -I$(XINCLUDE) -I/usr/X11R6/include/qt -I/usr/include/libpisock
+INCDIRS= -I$(XINCLUDE) -I$(QTDIR)/include/X11/qt -I$(PILOT_LINK)/include
#DEBUG = -g -D_DEBUG_
OPTIMIZE = -O2
@@ -20,8 +20,8 @@
# try this one if you want to link against the shared library of pilot-link
# (edit LFLAGS_PISOCK_DIR and/or LFLAGS_QT_DIR and uncomment if libs are not
# in a standard directory)
-# LFLAGS_PISOCK_DIR = -L/usr/lib
-LFLAGS_QT_DIR = -L/usr/X11R6/lib
+LFLAGS_PISOCK_DIR = -L$(PILOT_LINK)/lib
+LFLAGS_QT_DIR = -L$(QTDIR)/lib
LFLAGS = $(LFLAGS_ADD) $(LFLAGS_QT_DIR) -lqt $(LFLAGS_PISOCK_DIR) -lpisock
# uncomment the following line on HP-UX
@@ -41,11 +41,11 @@
RM_OPT = -f
# Edited for Debian GNU/Linux
-DESTDIR =
+DESTDIR = $(LOCALBASE)
-prefix = $(DESTDIR)/usr/X11R6
-doc_prefix = $(DESTDIR)/usr/doc
-conf_prefix = $(DESTDIR)/etc
+prefix = $(DESTDIR)
+doc_prefix = $(DESTDIR)/share/doc
+conf_prefix = $(doc_prefix)/$(TARGET)
####### Files

View File

@ -1,13 +0,0 @@
*** pilot.cpp.orig Wed Apr 28 21:36:46 1999
--- pilot.cpp Sat Jun 26 17:47:53 1999
***************
*** 27,32 ****
--- 27,34 ----
#include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
#include "pilot.h"

View File

@ -1,106 +0,0 @@
*** pia.cpp.orig Mon Apr 26 20:10:54 1999
--- pia.cpp Sat Jun 26 17:27:43 1999
***************
*** 96,107 ****
fileMenu->insertSeparator();
QPopupMenu *exportMenu = new QPopupMenu;
! idExport = exportMenu->insertItem( "Export as CSV...", this, SLOT(export()));
idExportLDIF = exportMenu->insertItem( "Export as LDIF...", this, SLOT(exportLDIF()));
fileMenu->insertItem("Export", exportMenu);
QPopupMenu *importMenu = new QPopupMenu;
! importMenu->insertItem("Import as CSV...", this, SLOT(import()));
importMenu->insertItem("Import as PilotMgr CSV", this, SLOT(importPMgr()));
fileMenu->insertItem("Import", importMenu);
--- 96,107 ----
fileMenu->insertSeparator();
QPopupMenu *exportMenu = new QPopupMenu;
! idExport = exportMenu->insertItem( "Export as CSV...", this, SLOT(exportCSV()));
idExportLDIF = exportMenu->insertItem( "Export as LDIF...", this, SLOT(exportLDIF()));
fileMenu->insertItem("Export", exportMenu);
QPopupMenu *importMenu = new QPopupMenu;
! importMenu->insertItem("Import as CSV...", this, SLOT(importCSV()));
importMenu->insertItem("Import as PilotMgr CSV", this, SLOT(importPMgr()));
fileMenu->insertItem("Import", importMenu);
***************
*** 2350,2356 ****
// export the current Address DB as CSV-file
! void PiAddress::export()
{
QString msg;
int i, iCat = cat->currentItem();
--- 2350,2356 ----
// export the current Address DB as CSV-file
! void PiAddress::exportCSV()
{
QString msg;
int i, iCat = cat->currentItem();
***************
*** 2426,2432 ****
}
// import CSF-file into Address DB
! void PiAddress::import()
{
QString msg;
--- 2426,2432 ----
}
// import CSF-file into Address DB
! void PiAddress::importCSV()
{
QString msg;
***************
*** 3448,3455 ****
toolBar.EnableItem(idToolbarWrite, FALSE);
toolBar.InsertSeparator();
! toolBar.Insert(pImport, this, SLOT(import()), "Import as CSV");
! idToolbarExport = toolBar.Insert(pExport, this, SLOT(export()),
"Export as CSV");
toolBar.EnableItem(idToolbarExport, FALSE);
toolBar.InsertSeparator();
--- 3448,3455 ----
toolBar.EnableItem(idToolbarWrite, FALSE);
toolBar.InsertSeparator();
! toolBar.Insert(pImport, this, SLOT(importCSV()), "Import as CSV");
! idToolbarExport = toolBar.Insert(pExport, this, SLOT(exportCSV()),
"Export as CSV");
toolBar.EnableItem(idToolbarExport, FALSE);
toolBar.InsertSeparator();
*** pia.h.orig Mon Apr 26 19:29:18 1999
--- pia.h Sat Jun 26 17:28:48 1999
***************
*** 86,94 ****
void helpFAQ();
void info();
void aboutQt();
! void export();
void exportLDIF();
! void import();
void importPMgr();
void printer();
void readPilot();
--- 86,94 ----
void helpFAQ();
void info();
void aboutQt();
! void exportCSV();
void exportLDIF();
! void importCSV();
void importPMgr();
void printer();
void readPilot();

View File

@ -6,7 +6,6 @@ share/doc/pi-address/html/pia-faq-4.html
share/doc/pi-address/html/pia-faq-5.html
share/doc/pi-address/html/pia-faq-6.html
share/doc/pi-address/html/pia-faq-7.html
share/doc/pi-address/html/pia-faq-8.html
share/doc/pi-address/html/pia-faq.html
share/doc/pi-address/html/pia-faq.ps.gz
share/doc/pi-address/html/pia-faq.txt