Upgrade to version 0.96 and unbreak.

PR:		ports/67747
Submitted by:	maintainer.

5 files changed, 36 insertions, 16 deletions

diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile
index 9f2df20fd408..8f2c3d893236 100644
--- a/print/kaspaliste/Makefile
+++ b/print/kaspaliste/Makefile
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=		kaspaliste
-PORTVERSION=		0.94
-PORTREVISION=	2
+PORTVERSION=		0.96
 CATEGORIES=		print kde
-MASTER_SITES=		http://kaspaliste.sourceforge.net/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	kaspaliste
 
 MAINTAINER=		jaapb@kerguelen.org
 COMMENT=		Bibliography tool for KDE/Postgres/BibTeX
 
-LIB_DEPENDS= \
-		pq.3:${PORTSDIR}/databases/postgresql7
+LIB_DEPENDS=		pq.3:${PORTSDIR}/databases/postgresql7
 
-USE_BZIP2=		yes
 USE_KDEBASE_VER=	3
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
@@ -26,10 +24,16 @@ CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	\
 			--with-pg-includes=${LOCALBASE}/include \
 			--with-pg-libs=${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+PKGMESSAGE=		${WRKDIR}/pkg-message
 
-.if ( ${OSVERSION} >= 502102 )
-BROKEN=			"Does not compile on FreeBSD >= 5.x"
-.endif
+pre-configure:
+	@${RM} ${WRKSRC}/config.cache
 
-.include <bsd.port.post.mk>
+post-install:
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/data/create.tables.sql ${DATADIR}
+	@${SED} -e "s|%%DATADIR%%|${DATADIR}|" < ${FILESDIR}/pkg-message.in	\
+		> ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/print/kaspaliste/distinfo b/print/kaspaliste/distinfo
index cc9e111ff0df..f7929aa1ab08 100644
--- a/print/kaspaliste/distinfo
+++ b/print/kaspaliste/distinfo
@@ -1,2 +1,2 @@
-MD5 (kaspaliste-0.94.tar.bz2) = f969e50c9731db2c2f07342062d5da84
-SIZE (kaspaliste-0.94.tar.bz2) = 1918364
+MD5 (kaspaliste-0.96.tar.gz) = 6256575740bb4bc5aa542f10e749bc01
+SIZE (kaspaliste-0.96.tar.gz) = 1923396
diff --git a/print/kaspaliste/files/patch-aa b/print/kaspaliste/files/patch-aa
index 9bdf59213dc1..2d91bba99582 100644
--- a/print/kaspaliste/files/patch-aa
+++ b/print/kaspaliste/files/patch-aa
@@ -1,9 +1,9 @@
---- kaspaliste/klib/table.cpp.orig	Tue Dec 16 12:32:24 2003
-+++ kaspaliste/klib/table.cpp	Tue Dec 16 12:32:32 2003
+--- kaspaliste/klib/table.cpp.orig     Sat Feb  7 10:54:32 2004
++++ kaspaliste/klib/table.cpp  Wed Jun  9 11:46:21 2004
 @@ -18,6 +18,7 @@
  #include <assert.h>
  #include "table.h"
- #include <iostream.h>
+ #include <iostream>
 +#include <unistd.h>
  
  #define Inherited KaspaBase
diff --git a/print/kaspaliste/files/pkg-message.in b/print/kaspaliste/files/pkg-message.in
new file mode 100644
index 000000000000..d517a89a74ab
--- /dev/null
+++ b/print/kaspaliste/files/pkg-message.in
@@ -0,0 +1,14 @@
+
+Before running kaspaliste, you have to create a postgresql database.
+Please refer to to the postgresql documentation.
+
+Once postgresql has been initialized, create your kaspaliste database:
+
+%createdb kaspaliste
+
+Then create your tables:
+
+%psql kaspaliste -f create.tables.sql
+
+This script has been installed in %%DATADIR%%.
+
diff --git a/print/kaspaliste/pkg-plist b/print/kaspaliste/pkg-plist
index 7e374271a93d..70cfac4bf900 100644
--- a/print/kaspaliste/pkg-plist
+++ b/print/kaspaliste/pkg-plist
@@ -111,6 +111,7 @@ share/apps/kaspaliste/icons/locolor/16x16/apps/inspart.png
 share/apps/kaspaliste/icons/locolor/16x16/apps/editundo.png
 share/apps/kaspaliste/pics/books.jpg
 share/config/kaspalisterc
+%%DATADIR%%/create.tables.sql
 share/doc/HTML/en/kaspaliste/author-doc.png
 share/doc/HTML/en/kaspaliste/biblio-doc.png
 share/doc/HTML/en/kaspaliste/bibtex-doc.png
@@ -135,5 +136,6 @@ share/doc/HTML/en/kaspaliste/search-doc.png
 @dirrm share/apps/kaspaliste/icons
 @dirrm share/apps/kaspaliste/pics
 @dirrm share/apps/kaspaliste
+@dirrm %%DATADIR%%
 @unexec rm %D/share/doc/HTML/en/kaspaliste/common 2>/dev/null || true
 @dirrm share/doc/HTML/en/kaspaliste