5 files changed, 24 insertions, 72 deletions

diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index ac6b3114203d..be7563f59752 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bbconf
-PORTVERSION=	1.8
+PORTVERSION=	1.10
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,17 +15,31 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Configurator for the Blackbox window manager
 
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
-USE_PERL5_BUILD=yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_QT_VER=	3
+USE_PERL5_BUILD=	yes
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		bbconf.1
+PORTDOCS=	AUTHORS ChangeLog README README.html TODO
+PLIST_FILES=	bin/bbconf \
+		lib/bbconf/plugins/libbbconf.so \
+		lib/bbconf/plugins/libkeybindings.so \
+		lib/bbconf/plugins/libmenu.so \
+		lib/bbconf/plugins/libthemes.so
+PLIST_DIRS=	lib/bbconf/plugins lib/bbconf
 
 post-patch:
-	@${FIND} ${WRKSRC} -name 'Makefile.in' -print | \
-	    ${XARGS} ${PERL} -pi.orig -e 's#lib/bbconf#libexec/bbconf#g'
+	@${PERL} -pi -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
+	@${PERL} -pi -e 's|-O2 ||g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/bbconf/distinfo b/x11-wm/bbconf/distinfo
index f301bcb55853..736596518da1 100644
--- a/x11-wm/bbconf/distinfo
+++ b/x11-wm/bbconf/distinfo
@@ -1,2 +1,2 @@
-MD5 (bbconf-1.8.tar.gz) = c0dde269ad1670fac6d7651e7d09d07e
-SIZE (bbconf-1.8.tar.gz) = 698764
+MD5 (bbconf-1.10.tar.gz) = 8ced4ce5683c40aa71e568e1fdc6ad35
+SIZE (bbconf-1.10.tar.gz) = 720599
diff --git a/x11-wm/bbconf/files/patch-Makefile.in b/x11-wm/bbconf/files/patch-Makefile.in
deleted file mode 100644
index bdd659333e94..000000000000
--- a/x11-wm/bbconf/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$FreeBSD$
-
---- Makefile.in.orig	Mon May 27 20:42:54 2002
-+++ Makefile.in	Thu Jun 13 14:17:29 2002
-@@ -234,7 +234,7 @@
- 
- MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
- 
--docdir = $(prefix)/doc/bbconf
-+docdir = $(prefix)/share/doc/bbconf
- 
- doc_DATA = AUTHORS COPYING ChangeLog README README.html TODO
- 
-@@ -309,6 +309,7 @@
- maintainer-clean-hdr:
- 
- install-docDATA: $(doc_DATA)
-+.ifndef NOPORTDOCS
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(docdir)
- 	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -320,6 +321,7 @@
- 	    $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
- 	  fi; fi; \
- 	done
-+.endif
- 
- uninstall-docDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/x11-wm/bbconf/files/patch-admin::ltmain.sh b/x11-wm/bbconf/files/patch-admin::ltmain.sh
deleted file mode 100644
index 0dcca4098027..000000000000
--- a/x11-wm/bbconf/files/patch-admin::ltmain.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-$FreeBSD$
-
---- admin/ltmain.sh.orig	Tue Oct 30 15:44:54 2001
-+++ admin/ltmain.sh	Tue Oct 30 15:44:57 2001
-@@ -4609,10 +4609,10 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	#name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	#instname="$dir/$name"i
-+	#$show "$install_prog $instname $destdir/$name"
-+	#$run eval "$install_prog $instname $destdir/$name" || exit $?
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-wm/bbconf/pkg-plist b/x11-wm/bbconf/pkg-plist
deleted file mode 100644
index 592a2b334b4b..000000000000
--- a/x11-wm/bbconf/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/bbconf
-libexec/bbconf/plugins/libbbconf.so
-libexec/bbconf/plugins/libkeybindings.so
-libexec/bbconf/plugins/libmenu.so
-libexec/bbconf/plugins/libthemes.so
-%%PORTDOCS%%share/doc/bbconf/AUTHORS
-%%PORTDOCS%%share/doc/bbconf/COPYING
-%%PORTDOCS%%share/doc/bbconf/ChangeLog
-%%PORTDOCS%%share/doc/bbconf/README
-%%PORTDOCS%%share/doc/bbconf/README.html
-%%PORTDOCS%%share/doc/bbconf/TODO
-%%PORTDOCS%%@dirrm share/doc/bbconf
-@dirrm libexec/bbconf/plugins
-@dirrm libexec/bbconf