Upgrade to 1.4.

4 files changed, 34 insertions, 41 deletions

diff --git a/databases/hs-hsql/Makefile b/databases/hs-hsql/Makefile
index f8aa2d353d46..bc82027cc106 100644
--- a/databases/hs-hsql/Makefile
+++ b/databases/hs-hsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hsql
-PORTVERSION=	1.2.1
+PORTVERSION=	1.4
 CATEGORIES=	databases haskell
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	htoolkit
@@ -27,9 +27,8 @@ ALL_TARGET=	all docs
 .endif
 
 WRKSRC=	${WRKDIR}/HSQL
-USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}/lib --enable-postgres
+CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-postgres
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include/postgresql/server \
 		CPPFLAGS=-I${LOCALBASE}/include/postgresql/server
 USE_GMAKE=	yes
@@ -73,5 +72,6 @@ pre-everything::
 post-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/hsql.pkg ${DATADIR}
+	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.post.mk>
diff --git a/databases/hs-hsql/distinfo b/databases/hs-hsql/distinfo
index 8bc7ef0e6442..650f737c7474 100644
--- a/databases/hs-hsql/distinfo
+++ b/databases/hs-hsql/distinfo
@@ -1,2 +1,2 @@
-MD5 (HSQL-1.2.1.tar.bz2) = 87e654139f80b55dbba9825036575d91
-SIZE (HSQL-1.2.1.tar.bz2) = 60862
+MD5 (HSQL-1.4.tar.gz) = 0a53db9708b5816978ab452209d67155
+SIZE (HSQL-1.4.tar.gz) = 84828
diff --git a/databases/hs-hsql/files/patch-Makefile b/databases/hs-hsql/files/patch-Makefile
index 4c722186e8d8..977fbd92cedf 100644
--- a/databases/hs-hsql/files/patch-Makefile
+++ b/databases/hs-hsql/files/patch-Makefile
@@ -1,26 +1,11 @@
---- Makefile.orig	Sun Feb 15 11:54:27 2004
-+++ Makefile	Sun Feb 22 17:11:53 2004
-@@ -138,12 +138,12 @@
- 
- docs : $(HS_PPS)
- 	mkdir -p $(DOCDIR)
--	$(HADDOCK) -h -o $(DOCDIR) $(HS_PPS) -ihttp://www.haskell.org/ghc/docs/latest/html/libraries/base,/usr/share/ghc-6.2/html/libraries/base/base.haddock 
-+	$(HADDOCK) -h -o $(DOCDIR) $(HS_PPS)
- 
- 
- install: $(patsubst %, install-%, $(COMPILERS))
- 
--install-ghc: $(HSQLLib) $(HI_SRC) docs
-+install-ghc: $(HSQLLib) $(HI_SRC)
- 	$(INSTALL) $(HSQLLib) $(GHC_DIR)/libHSsql.a
- 	$(INSTALL) -d $(GHC_DIR)/imports/Database
- 	for i in $(patsubst $(BUILDDIR)/%,%,$(HI_SRC)); do \
-@@ -153,8 +153,8 @@
+--- Makefile.orig	Sun Apr 11 17:38:33 2004
++++ Makefile	Fri Apr 23 14:19:17 2004
+@@ -154,8 +154,8 @@
  	rm -f $(GHC_DIR)/HSsql.o
  	$(GHC_PKG) -u -g -i hsql.pkg
  	if test -f $(DOCDIR)/index.html; then  \
--	   $(INSTALL) -d $(GHC_DIR)/doc/html/libraries/hsql; \
--	   $(INSTALL) -c $(DOCDIR)/* $(GHC_DIR)/doc/html/libraries/hsql; \
+-	   $(INSTALL) -d $(DOC_DIR); \
+-	   $(INSTALL) -c $(DOCDIR)/* $(DOC_DIR); \
 +	   $(INSTALL) -d ${DOCSDIR}; \
 +	   $(INSTALL) -c $(DOCDIR)/* ${DOCSDIR}; \
  	fi
diff --git a/databases/hs-hsql/pkg-plist b/databases/hs-hsql/pkg-plist
index e6c31f818602..635a3a9cb62e 100644
--- a/databases/hs-hsql/pkg-plist
+++ b/databases/hs-hsql/pkg-plist
@@ -1,13 +1,18 @@
-lib/ghc-%%GHC_VERSION%%/HSsql.o
-lib/ghc-%%GHC_VERSION%%/imports/Database/HSQL/PostgreSQL.hi
-lib/ghc-%%GHC_VERSION%%/imports/Database/HSQL/Types.hi
-lib/ghc-%%GHC_VERSION%%/imports/Database/HSQL.hi
-lib/ghc-%%GHC_VERSION%%/libHSsql.a
-%%HUGS%%lib/hugs/libraries/Database/HSQL/PostgreSQL.hs
-%%HUGS%%lib/hugs/libraries/Database/HSQL/PostgreSQL.so
-%%HUGS%%lib/hugs/libraries/Database/HSQL/Types.hs
-%%HUGS%%lib/hugs/libraries/Database/HSQL.hs
-%%HUGS%%lib/hugs/libraries/Database/HSQL.so
+lib/HSQL/GHC/HSsql.o
+lib/HSQL/GHC/imports/Database/HSQL/PostgreSQL.hi
+lib/HSQL/GHC/imports/Database/HSQL/Types.hi
+lib/HSQL/GHC/imports/Database/HSQL.hi
+lib/HSQL/GHC/libHSsql.a
+%%HUGS%%lib/HSQL/Hugs/libraries/Database/HSQL/PostgreSQL.hs
+%%HUGS%%lib/HSQL/Hugs/libraries/Database/HSQL/PostgreSQL.so
+%%HUGS%%lib/HSQL/Hugs/libraries/Database/HSQL/Types.hs
+%%HUGS%%lib/HSQL/Hugs/libraries/Database/HSQL.hs
+%%HUGS%%lib/HSQL/Hugs/libraries/Database/HSQL.so
+%%PORTDOCS%%%%DOCSDIR%%/Database.HSQL.MySQL.html
+%%PORTDOCS%%%%DOCSDIR%%/Database.HSQL.ODBC.html
+%%PORTDOCS%%%%DOCSDIR%%/Database.HSQL.PostgreSQL.html
+%%PORTDOCS%%%%DOCSDIR%%/Database.HSQL.SQLite.html
+%%PORTDOCS%%%%DOCSDIR%%/Database.HSQL.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-B.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-C.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-D.html
@@ -26,13 +31,16 @@ lib/ghc-%%GHC_VERSION%%/libHSsql.a
 %%PORTDOCS%%%%DOCSDIR%%/haddock.css
 %%PORTDOCS%%%%DOCSDIR%%/haskell_icon.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/Database.HSQL.PostgreSQL.html
-%%PORTDOCS%%%%DOCSDIR%%/Database.HSQL.html
 %%DATADIR%%/hsql.pkg
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/Database/HSQL
-@dirrm lib/ghc-%%GHC_VERSION%%/imports/Database
-%%HUGS%%@dirrm lib/hugs/libraries/Database/HSQL
-%%HUGS%%@dirrm lib/hugs/libraries/Database
+@dirrm lib/HSQL/GHC/imports/Database/HSQL
+@dirrm lib/HSQL/GHC/imports/Database
+@dirrm lib/HSQL/GHC/imports
+@dirrm lib/HSQL/GHC
+%%HUGS%%@dirrm lib/HSQL/Hugs/libraries/Database/HSQL
+%%HUGS%%@dirrm lib/HSQL/Hugs/libraries/Database
+%%HUGS%%@dirrm lib/HSQL/Hugs/libraries
+%%HUGS%%@dirrm lib/HSQL/Hugs
+@dirrm lib/HSQL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @exec %D/bin/ghc-pkg -u -g -i %D/share/hsql/hsql.pkg