5 files changed, 72 insertions, 57 deletions

diff --git a/sysutils/kdar/Makefile b/sysutils/kdar/Makefile
index f9231fa19b0e..aa95ea963cab 100644
--- a/sysutils/kdar/Makefile
+++ b/sysutils/kdar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdar
-PORTVERSION=	1.2.0.b.3
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kdar
@@ -17,11 +17,15 @@ COMMENT=	KDar is KDE-based backuptool using libdar
 
 LIB_DEPENDS=	dar.2:${PORTSDIR}/sysutils/dar
 
-BROKEN=		Configure fails
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_KDEBASE_VER=	3
+USE_REINPLACE=	yes
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/kdar/distinfo b/sysutils/kdar/distinfo
index 0e93d3693f44..97c85052140a 100644
--- a/sysutils/kdar/distinfo
+++ b/sysutils/kdar/distinfo
@@ -1,2 +1,2 @@
-MD5 (kdar-1.2.0-beta3.tar.bz2) = cdd78e4dce2ba51b00dce32c03354e49
-SIZE (kdar-1.2.0-beta3.tar.bz2) = 1092314
+MD5 (kdar-1.2.0.tar.bz2) = 642d024fa106f2d871f6aecf32869f02
+SIZE (kdar-1.2.0.tar.bz2) = 1744814
diff --git a/sysutils/kdar/files/patch-src-Makefile.in b/sysutils/kdar/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..48b4bec9adeb
--- /dev/null
+++ b/sysutils/kdar/files/patch-src-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed Dec  1 21:55:50 2004
++++ src/Makefile.in	Wed Dec  1 21:56:21 2004
+@@ -246,7 +246,7 @@
+ kdar_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # the libraries to link against.
+-kdar_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)
++kdar_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) $(LIBPTHREAD)
+ 
+ # which sources should be compiled for kdar
+ #>- kdar_SOURCES = kdarConfigureDlg.ui kdardlg.ui kdarcreatedlg.ui kdarcreatewizarddlg.ui kdardirectoryfilterdlg.ui kdarcompressionfilterdlg.ui kdarfilefilterdlg.ui extractdlg.ui newarchivestoragedirdlg.ui archiveHandle.cpp kdariface.skel kdarListViewItem.cpp kdardialog.cpp kdarConfig.cpp kdarcreatedialog.cpp kdarfilefilterdialog.cpp kdarcompressionfilterdialog.cpp kdardirectoryfilterdialog.cpp kdarextractdialog.cpp kdarcreatearchivewizard.cpp newarchivestoragedirdialog.cpp createArchiveThread.cpp diffArchiveThread.cpp getUserResponseThread.cpp isolateArchiveThread.cpp listArchiveThread.cpp openArchiveThread.cpp populateTreeArchiveThread.cpp restoreArchiveThread.cpp testArchiveThread.cpp kdarview.cpp kdar.cpp main.cpp kdartestsdlg.ui kdartestsdialog.cpp kdarSplash.cpp
diff --git a/sysutils/kdar/pkg-descr b/sysutils/kdar/pkg-descr
index 7ba7485b179a..d1217aab48d0 100644
--- a/sysutils/kdar/pkg-descr
+++ b/sysutils/kdar/pkg-descr
@@ -4,8 +4,7 @@ safely backup (with compression if you like), view and restore files
 using KDar, along with a few easy UNIX commands for mounting and
 burning CD-R's, Zip and Jazz drives, DVD-R's, floppies, or any other
 disk-based storage media.
+The KDar project was started by Johnathan K. Burchill, Ph.D., and it 
+is hosted by SourceForge.net.
 
 WWW:	http://kdar.sf.net
-
-- Lehmann
-kay_lehmann@web.de
diff --git a/sysutils/kdar/pkg-plist b/sysutils/kdar/pkg-plist
index 785fe280dc5e..ed601ce885ea 100644
--- a/sysutils/kdar/pkg-plist
+++ b/sysutils/kdar/pkg-plist
@@ -1,59 +1,60 @@
 bin/kdar
-share/applnk/Utilities/kdar.desktop
-share/apps/kdar/kdarui.rc
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-blank-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-compression-filters-selected-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-directory-filter-selected-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-file-filters-selected-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-name-selected-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-root-dir-selected-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-select-directory-filter-dialog-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-create-dialog-slice-command-selected-small.png
-share/doc/HTML/en/kdar/KDar-1.1.0-createWizard-page1-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-main-listing-small-annotated.png
-share/doc/HTML/en/kdar/KDar-1.0.0-main-listing-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-open-archive-dialog-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-restore-small.png
-share/doc/HTML/en/kdar/KDar-1.0.0-settings-create-isolate-small.png
-share/doc/HTML/en/kdar/compilation-and-installation.html
-share/doc/HTML/en/kdar/creating-archives.html
-share/doc/HTML/en/kdar/features.html
-share/doc/HTML/en/kdar/kdar-settings.html
-share/doc/HTML/en/kdar/index.cache.bz2
+share/doc/HTML/en/kdar/KDar-1.2.0-about-about_tab-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-comparison-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-compression-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-directories-new-dialog-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-directories-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-files-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-filesystem-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-fonts-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-general-small.png
 share/doc/HTML/en/kdar/index.docbook
-share/doc/HTML/en/kdar/index.html
-share/doc/HTML/en/kdar/installation.html
-share/doc/HTML/en/kdar/introduction.html
-share/doc/HTML/en/kdar/make-docs-meinproc
-share/doc/HTML/en/kdar/parts.html
-share/doc/HTML/en/kdar/questionsanswersandtips.html
-share/doc/HTML/en/kdar/requirements.html
-share/doc/HTML/en/kdar/restoring-archives.html
-share/doc/HTML/en/kdar/using-kdar.html
-share/doc/HTML/en/kdar/viewing-archives.html
-share/icons/hicolor/16x16/actions/kdar_create.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-restore-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-configure-slicing-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-archivename-empty-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-archivename-present-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-configure-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-create-profile-and-finish-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-referencearchive-disabled-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-referencearchive-enabled-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-restore-profile-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-rootdirectory-empty-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-create-wizard-rootdirectory-present-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-creation-advanced-empty-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-main-creating-archive-statusbar-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-main-listing-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-main-small-annotated.png
+share/doc/HTML/en/kdar/KDar-1.2.0-main-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-main-toolbar-indexed-colors-256.png
+share/doc/HTML/en/kdar/KDar-1.2.0-open-archive-dialog-small.png
+share/doc/HTML/en/kdar/KDar-1.2.0-restore-empty-small.png
+share/doc/HTML/en/kdar/index.cache.bz2
+share/icons/locolor/16x16/apps/kdar.png
+share/icons/locolor/32x32/apps/kdar.png
+share/icons/hicolor/48x48/actions/kdar_extract.png
+share/icons/hicolor/48x48/actions/kdar_create.png
+share/icons/hicolor/48x48/actions/kdar_diff.png
+share/icons/hicolor/48x48/actions/kdar_view.png
+share/icons/hicolor/48x48/actions/kdar_isolate.png
+share/icons/hicolor/48x48/actions/kdar_test.png
+share/icons/hicolor/48x48/apps/kdar.png
+share/icons/hicolor/16x16/actions/kdar_view.png
+share/icons/hicolor/16x16/actions/kdar_test.png
+share/icons/hicolor/16x16/actions/kdar_isolate.png
 share/icons/hicolor/16x16/actions/kdar_diff.png
 share/icons/hicolor/16x16/actions/kdar_extract.png
-share/icons/hicolor/16x16/actions/kdar_isolate.png
-share/icons/hicolor/16x16/actions/kdar_test.png
-share/icons/hicolor/16x16/actions/kdar_view.png
+share/icons/hicolor/16x16/actions/kdar_create.png
 share/icons/hicolor/16x16/apps/kdar.png
-share/icons/hicolor/32x32/actions/kdar_create.png
-share/icons/hicolor/32x32/actions/kdar_diff.png
-share/icons/hicolor/32x32/actions/kdar_extract.png
-share/icons/hicolor/32x32/actions/kdar_isolate.png
 share/icons/hicolor/32x32/actions/kdar_test.png
 share/icons/hicolor/32x32/actions/kdar_view.png
+share/icons/hicolor/32x32/actions/kdar_diff.png
+share/icons/hicolor/32x32/actions/kdar_create.png
+share/icons/hicolor/32x32/actions/kdar_isolate.png
+share/icons/hicolor/32x32/actions/kdar_extract.png
 share/icons/hicolor/32x32/apps/kdar.png
-share/icons/hicolor/48x48/actions/kdar_create.png
-share/icons/hicolor/48x48/actions/kdar_diff.png
-share/icons/hicolor/48x48/actions/kdar_extract.png
-share/icons/hicolor/48x48/actions/kdar_isolate.png
-share/icons/hicolor/48x48/actions/kdar_test.png
-share/icons/hicolor/48x48/actions/kdar_view.png
-share/icons/hicolor/48x48/apps/kdar.png
-share/icons/locolor/16x16/apps/kdar.png
-share/icons/locolor/32x32/apps/kdar.png
+share/applnk/Utilities/kdar.desktop
+share/apps/kdar/kdarui.rc
+share/apps/kdar/kdar-splash.png
 @dirrm share/doc/HTML/en/kdar/common
 @dirrm share/doc/HTML/en/kdar
 @dirrm share/apps/kdar