3 files changed, 6 insertions, 40 deletions

diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 8ee631a65390..4c1bf631f47c 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	uniplate
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Uniform type generic traversals for Haskell
 
+LICENSE=	BSD
+
 CABAL_SETUP=	Setup.hs
+USE_CABAL=	syb
 
 PORTDATA=		*
 INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/uniplate.htm ${DATADIR}
diff --git a/devel/hs-uniplate/distinfo b/devel/hs-uniplate/distinfo
index 118da1c8ed94..aefedbb1e451 100644
--- a/devel/hs-uniplate/distinfo
+++ b/devel/hs-uniplate/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/uniplate-1.5.1.tar.gz) = 78c7bdc6021b78f5cb650ccd5ab00973
-SHA256 (cabal/uniplate-1.5.1.tar.gz) = cfeaaaabbbe318992df0c51a0c04729b22dac244f415b80a3b388708ed9cfc33
-SIZE (cabal/uniplate-1.5.1.tar.gz) = 23941
+SHA256 (cabal/uniplate-1.6.tar.gz) = b9ff5fe4c462a2075587c7fac6da9d07e544ee0c9ca781e8831a1a69f5f7d48e
+SIZE (cabal/uniplate-1.6.tar.gz) = 26216
diff --git a/devel/hs-uniplate/pkg-plist b/devel/hs-uniplate/pkg-plist
deleted file mode 100644
index 024867ec4ee3..000000000000
--- a/devel/hs-uniplate/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Biplate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Compos.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateData.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateDirect.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateInternal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/PlateTypeable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/SYB.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Str.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Operations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Direct.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Typeable.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Data.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/DataOnly.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal/Data.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal/DataOnlyOperations.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/UniplateOn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/UniplateStr.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/UniplateStrOn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate/Internal
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics/Uniplate
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Generics
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old