3 files changed, 47 insertions, 26 deletions

diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index 157114884fce..0d51603db002 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	valknut
-PORTVERSION=	0.4.4
+PORTVERSION=	0.4.5
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	wxdcgui
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A Direct Connect client QT GUI
 
-LIB_DEPENDS=	dc.0:${PORTSDIR}/net-p2p/dclib \
+LIB_DEPENDS=	dc.1:${PORTSDIR}/net-p2p/dclib \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
@@ -29,17 +29,16 @@ QT_COMPONENTS=	corelib gui network qt3support moc uic rcc linguist
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libdc=${LOCALBASE} \
-		--x-libraries=${LOCALBASE}/lib \
-		--x-includes=${LOCALBASE}/include
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		RCC="${LOCALBASE}/bin/rcc" LRELEASE="${LOCALBASE}/bin/lrelease-qt4"
+USE_AUTOTOOLS=	autoconf:262
+INSTALLS_ICONS=	yes
+CFLAGS+=	-I${QT_INCDIR} -I${LOCALBASE}/include
+LDFLAGS+=	-L${QT_LIBDIR} -L${LOCALBASE}/lib
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g;\
+	    s|-D_XOPEN_SOURCE=500||g' \
+	    ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
+	    ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}.in
 
 .include <bsd.port.mk>
diff --git a/net-p2p/valknut/distinfo b/net-p2p/valknut/distinfo
index d62a3a725550..99ef5b05d33d 100644
--- a/net-p2p/valknut/distinfo
+++ b/net-p2p/valknut/distinfo
@@ -1,3 +1,3 @@
-MD5 (valknut-0.4.4.tar.bz2) = 9496148e1aae9ecfe502af6e6da5e6d6
-SHA256 (valknut-0.4.4.tar.bz2) = cf8479c041f3e0c53e45e06c6bce1aa89d309dbdaff1ee57d45172bec6d770e0
-SIZE (valknut-0.4.4.tar.bz2) = 1184418
+MD5 (valknut-0.4.5.tar.bz2) = 5ac542802f32d7802922448904a38638
+SHA256 (valknut-0.4.5.tar.bz2) = 8600c995ce4024924004acc763a8eca4164bafe74e33ed2904be4a6bad15743a
+SIZE (valknut-0.4.5.tar.bz2) = 1084523
diff --git a/net-p2p/valknut/pkg-plist b/net-p2p/valknut/pkg-plist
index aa00d6740d55..ea3b1ca6d741 100644
--- a/net-p2p/valknut/pkg-plist
+++ b/net-p2p/valknut/pkg-plist
@@ -8,6 +8,7 @@ bin/valknut
 %%DATADIR%%/icons/appl/default/bookmark_folder.xpm
 %%DATADIR%%/icons/appl/default/configure.xpm
 %%DATADIR%%/icons/appl/default/configure_22x22.xpm
+%%DATADIR%%/icons/appl/default/connect.xpm
 %%DATADIR%%/icons/appl/default/connect_creating.xpm
 %%DATADIR%%/icons/appl/default/connect_no.xpm
 %%DATADIR%%/icons/appl/default/connected.xpm
@@ -29,6 +30,7 @@ bin/valknut
 %%DATADIR%%/icons/appl/default/filetype-video.xpm
 %%DATADIR%%/icons/appl/default/find.xpm
 %%DATADIR%%/icons/appl/default/find_22x22.xpm
+%%DATADIR%%/icons/appl/default/fish.xpm
 %%DATADIR%%/icons/appl/default/flag_bosnian.xpm
 %%DATADIR%%/icons/appl/default/flag_brazilian.xpm
 %%DATADIR%%/icons/appl/default/flag_czech.xpm
@@ -46,8 +48,8 @@ bin/valknut
 %%DATADIR%%/icons/appl/default/flag_norway.xpm
 %%DATADIR%%/icons/appl/default/flag_poland.xpm
 %%DATADIR%%/icons/appl/default/flag_romania.xpm
-%%DATADIR%%/icons/appl/default/flag_serbia.xpm
 %%DATADIR%%/icons/appl/default/flag_russia.xpm
+%%DATADIR%%/icons/appl/default/flag_serbia.xpm
 %%DATADIR%%/icons/appl/default/flag_slovak.xpm
 %%DATADIR%%/icons/appl/default/flag_spain.xpm
 %%DATADIR%%/icons/appl/default/flag_sweden.xpm
@@ -57,15 +59,7 @@ bin/valknut
 %%DATADIR%%/icons/appl/default/globe.xpm
 %%DATADIR%%/icons/appl/default/gv.xpm
 %%DATADIR%%/icons/appl/default/help.xpm
-%%DATADIR%%/icons/appl/default/icon_128x128.icns
-%%DATADIR%%/icons/appl/default/icon_128x128.png
-%%DATADIR%%/icons/appl/default/icon_16x16.png
-%%DATADIR%%/icons/appl/default/icon_22x22.png
 %%DATADIR%%/icons/appl/default/icon_22x22.xpm
-%%DATADIR%%/icons/appl/default/icon_24x24.png
-%%DATADIR%%/icons/appl/default/icon_32x32.png
-%%DATADIR%%/icons/appl/default/icon_48x48.png
-%%DATADIR%%/icons/appl/default/icon_64x64.png
 %%DATADIR%%/icons/appl/default/icon_operator.xpm
 %%DATADIR%%/icons/appl/default/icon_user.xpm
 %%DATADIR%%/icons/appl/default/icon_user_away.xpm
@@ -87,11 +81,14 @@ bin/valknut
 %%DATADIR%%/icons/appl/default/transfer.xpm
 %%DATADIR%%/icons/appl/default/translate.xpm
 %%DATADIR%%/icons/appl/default/up.xpm
+%%DATADIR%%/icons/appl/default/update.xpm
+%%DATADIR%%/icons/appl/default/users.xpm
+%%DATADIR%%/icons/appl/default/users_22x22.xpm
 %%DATADIR%%/icons/appl/default/view_sidetree.xpm
-%%DATADIR%%/icons/emot/simple/emoticons.xml
-%%DATADIR%%/icons/emot/simple/simple-tango.xpm
 %%DATADIR%%/icons/emot/default/emoticons.xml
 %%DATADIR%%/icons/emot/default/emoticons.xpm
+%%DATADIR%%/icons/emot/simple/emoticons.xml
+%%DATADIR%%/icons/emot/simple/simple-tango.xpm
 %%DATADIR%%/icons/user/default/usericons.xml
 %%DATADIR%%/icons/user/default/usericons.xpm
 %%DATADIR%%/translation/valknut.bs.qm
@@ -117,6 +114,14 @@ bin/valknut
 %%DATADIR%%/translation/valknut.sr@latin.qm
 %%DATADIR%%/translation/valknut.sr.qm
 %%DATADIR%%/translation/valknut.sv.qm
+share/icons/hicolor/16x16/apps/icon_16x16.png
+share/icons/hicolor/22x22/apps/icon_22x22.png
+share/icons/hicolor/24x24/apps/icon_24x24.png
+share/icons/hicolor/32x32/apps/icon_32x32.png
+share/icons/hicolor/48x48/apps/icon_48x48.png
+share/icons/hicolor/64x64/apps/icon_64x64.png
+share/icons/hicolor/128x128/apps/icon_128x128.png
+share/applications/valknut.desktop
 @dirrm %%DATADIR%%/translation
 @dirrm %%DATADIR%%/sounds/default
 @dirrm %%DATADIR%%/sounds
@@ -129,3 +134,20 @@ bin/valknut
 @dirrm %%DATADIR%%/icons/appl
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications