diff -ruN libspectrum.old/Makefile libspectrum/Makefile
--- libspectrum.old/Makefile	Sun Mar 14 07:16:29 2004
+++ libspectrum/Makefile	Sun May 15 13:16:16 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libspectrum
-PORTVERSION=	0.2.0.1
+PORTVERSION=	0.2.2
 CATEGORIES=	emulators devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fuse-emulator
@@ -15,29 +15,28 @@
 COMMENT=	Handling of ZX-Spectrum emulator files formats
 
 USE_PERL5_BUILD=	yes
-USE_GNOME=	glib12
+WANT_GNOME=		yes
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
+MAN3=		libspectrum.3
+
+OPTIONS=	        GLIB "Use GLib" on \
+			GCRYPT "Use libgcrypt" off
+
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_GLIB)
-USE_GNOME=	glib12
+USE_GNOME=	glib20
 .else
-CONFIGURE_ARGS=	--without-glib
+CONFIGURE_ARGS+=	--without-glib
 .endif
 
 .if defined(WITH_GCRYPT) || exists(${LOCALBASE}/include/gcrypt.h)
-LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	gcrypt.13:${PORTSDIR}/security/libgcrypt
 .endif
 
-DOCS=		AUTHORS ChangeLog README THANKS doc/*
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITHOUT_GLIB=yes       don't use GLib"
-	@${ECHO_MSG} "  WITH_GCRYPT=yes        use libgcrypt"
-	@${ECHO_MSG} ""
+DOCS=		AUTHORS ChangeLog README THANKS doc/libspectrum.txt
 
 .if !defined(NOPORTDOCS)
 post-install:
@@ -45,4 +44,4 @@
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN libspectrum.old/distinfo libspectrum/distinfo
--- libspectrum.old/distinfo	Wed Mar 31 05:07:42 2004
+++ libspectrum/distinfo	Sat May 14 21:43:04 2005
@@ -1,2 +1,2 @@
-MD5 (libspectrum-0.2.0.1.tar.gz) = 576f41f0c7db0c7c34a447db4a11f22a
-SIZE (libspectrum-0.2.0.1.tar.gz) = 236857
+MD5 (libspectrum-0.2.2.tar.gz) = 30b0e5082b3b9d9f6fc430fd8912c0bd
+SIZE (libspectrum-0.2.2.tar.gz) = 386960
diff -ruN libspectrum.old/pkg-plist libspectrum/pkg-plist
--- libspectrum.old/pkg-plist	Wed Oct 29 17:19:28 2003
+++ libspectrum/pkg-plist	Sat May 14 22:06:31 2005
@@ -3,7 +3,7 @@
 lib/libspectrum.a
 lib/libspectrum.la
 lib/libspectrum.so
-lib/libspectrum.so.2
+lib/libspectrum.so.4
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README