===================================================================
RCS file: /cvs/ports/textproc/goldendict/Attic/Makefile,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -r1.1 -r1.4
--- ports/textproc/goldendict/Attic/Makefile	2010/06/04 18:18:32	1.1
+++ ports/textproc/goldendict/Attic/Makefile	2011/04/03 19:30:10	1.4
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.1 2010/06/04 17:18:32 yason Exp $
+# $OpenBSD: Makefile,v 1.4 2011/04/03 19:30:10 yason Exp $
 
 COMMENT =		feature-rich dictionary lookup program
 
-DISTNAME =		goldendict-0.9.0-src-x11
-PKGNAME = 		${DISTNAME:S/-src-x11//}
+DISTNAME =		goldendict-1.0.1-src
+PKGNAME = 		${DISTNAME:S/-src//}
 
-#SHARED_LIBS =		???
-
 CATEGORIES =		textproc
 
 HOMEPAGE =		http://www.goldendict.org/
 
-#MAINTAINER =		???
+MAINTAINER =		Kirill Bychkov <yason@linkevel.net>
 
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
@@ -19,26 +17,27 @@
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES =		${MASTER_SITE_BERLIOS:=goldendict/}
+MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=goldendict/}
 EXTRACT_SUFX =		.tar.bz2
+EXTRACT_CASES += 	*.tar.bz2) ${BZIP2} -dc ${FULLDISTDIR}/$$archive | ${TAR} xf - -C ${WRKDIST};;
 
-WANTLIB += X11 Xtst c iconv m ogg pthread sqlite3 stdc++ vorbis
-WANTLIB += vorbisfile z
+WANTLIB += QtDBus QtGui QtNetwork QtWebKit QtXml X11 Xtst c execinfo hunspell-1.2
+WANTLIB += iconv m ogg phonon pthread stdc++ vorbis vorbisfile z
 
 MODULES =		x11/qt4
-LIB_DEPENDS =		hunspell-1.2::textproc/hunspell \
-			QtDBus,QtGui,QtNetwork::x11/qt4 \
-			QtWebKit,QtXml,QtXmlPatterns::x11/qt4 \
-			phonon::x11/qt4
-RUN_DEPENDS = 		::devel/desktop-file-utils
+LIB_DEPENDS =		devel/libexecinfo \
+			textproc/hunspell \
+			${MODQT4_LIB_DEPENDS}
+RUN_DEPENDS = 		devel/desktop-file-utils
 
-USE_X11 =		Yes
+WRKDIST =		${WRKDIR}/${DISTNAME:S/-src//}
 
-WRKDIST =		${WRKDIR}/${DISTNAME:S/-x11//}
+pre-extract:
+	mkdir ${WRKDIST}
 
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake4 \
-		-unix INCLUDEPATH+=${X11BASE}/include \
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} QT_INSTALL_BINS=${LOCALBASE}/bin ${LOCALBASE}/bin/qmake4 \
+		INCLUDEPATH+=${X11BASE}/include \
 		LIBS+=-L${LOCALBASE}/lib ${MAKE_FLAGS} goldendict.pro
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/goldendict ${PREFIX}/bin/