Index: head/sysutils/scanbuttond/Makefile
===================================================================
--- head/sysutils/scanbuttond/Makefile	(revision 359764)
+++ head/sysutils/scanbuttond/Makefile	(revision 359765)
@@ -1,45 +1,38 @@
 # Created by: Daniel Thiele
 # $FreeBSD$
 
 PORTNAME=	scanbuttond
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
 MAINTAINER=	dthiele@gmx.net
 COMMENT=	Daemon to monitor and configure modern scanner's buttons
 
 LICENSE=	GPLv2
 
+USES=		libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 SUB_FILES+=	pkg-message
 
-NO_STAGE=	yes
 pre-configure:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
 		${REINPLACE_CMD} -e 's|-ldl||g'
 
 pre-install:
 	@if [ -f ${WRKSRC}/scripts/buttonpressed.sh ]; then \
 		for na in buttonpressed.sh initscanner.sh; do \
 			${MV} ${WRKSRC}/scripts/$$na ${WRKSRC}/scripts/$$na.sample ; \
 		done; \
 		${REINPLACE_CMD} -e 's|\.sh|.sh.sample|g' ${WRKSRC}/scripts/Makefile ; \
 		${MV} ${WRKSRC}/backends/meta.conf ${WRKSRC}/backends/meta.conf.sample ; \
 		${REINPLACE_CMD} -e 's|meta\.conf|meta.conf.sample|g' ${WRKSRC}/backends/Makefile ; \
 	fi
-
-post-install:
-	@for na in buttonpressed.sh initscanner.sh meta.conf; do \
-		if [ ! -f ${ETCDIR}/$$na ]; then \
-			${CP} -p ${ETCDIR}/$$na.sample ${ETCDIR}/$$na; \
-		fi; \
-	done
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: head/sysutils/scanbuttond/pkg-plist
===================================================================
--- head/sysutils/scanbuttond/pkg-plist	(revision 359764)
+++ head/sysutils/scanbuttond/pkg-plist	(revision 359765)
@@ -1,35 +1,29 @@
 bin/scanbuttond
-@unexec if cmp -s %D/etc/scanbuttond/buttonpressed.sh.sample %D/etc/scanbuttond/buttonpressed.sh; then rm -f %D/etc/scanbuttond/buttonpressed.sh; fi
-etc/scanbuttond/buttonpressed.sh.sample
-@exec if [ ! -f %D/etc/scanbuttond/buttonpressed.sh ] ; then cp -p %D/%F %B/buttonpressed.sh; fi
-@unexec if cmp -s %D/etc/scanbuttond/initscanner.sh.sample %D/etc/scanbuttond/initscanner.sh; then rm -f %D/etc/scanbuttond/initscanner.sh; fi
-etc/scanbuttond/initscanner.sh.sample
-@exec if [ ! -f %D/etc/scanbuttond/initscanner.sh ] ; then cp -p %D/%F %B/initscanner.sh; fi
-@unexec if cmp -s %D/etc/scanbuttond/meta.conf.sample %D/etc/scanbuttond/meta.conf; then rm -f %D/etc/scanbuttond/meta.conf; fi
-etc/scanbuttond/meta.conf.sample
-@exec if [ ! -f %D/etc/scanbuttond/meta.conf ] ; then cp -p %D/%F %B/meta.conf; fi
-lib/libscanbtnd-backend_epson.la
+@sample etc/scanbuttond/buttonpressed.sh.sample
+@sample etc/scanbuttond/initscanner.sh.sample
+@sample etc/scanbuttond/meta.conf.sample
 lib/libscanbtnd-backend_epson.so
 lib/libscanbtnd-backend_epson.so.1
-lib/libscanbtnd-backend_meta.la
+lib/libscanbtnd-backend_epson.so.1.0.0
 lib/libscanbtnd-backend_meta.so
 lib/libscanbtnd-backend_meta.so.1
-lib/libscanbtnd-backend_mustek.la
+lib/libscanbtnd-backend_meta.so.1.0.0
 lib/libscanbtnd-backend_mustek.so
 lib/libscanbtnd-backend_mustek.so.1
-lib/libscanbtnd-backend_niash.la
+lib/libscanbtnd-backend_mustek.so.1.0.0
 lib/libscanbtnd-backend_niash.so
 lib/libscanbtnd-backend_niash.so.1
-lib/libscanbtnd-backend_plustek.la
+lib/libscanbtnd-backend_niash.so.1.0.0
 lib/libscanbtnd-backend_plustek.so
 lib/libscanbtnd-backend_plustek.so.1
-lib/libscanbtnd-backend_plustek_umax.la
+lib/libscanbtnd-backend_plustek.so.1.0.0
 lib/libscanbtnd-backend_plustek_umax.so
 lib/libscanbtnd-backend_plustek_umax.so.1
-lib/libscanbtnd-backend_snapscan.la
+lib/libscanbtnd-backend_plustek_umax.so.1.0.0
 lib/libscanbtnd-backend_snapscan.so
 lib/libscanbtnd-backend_snapscan.so.1
-lib/libscanbtnd-interface_usb.la
+lib/libscanbtnd-backend_snapscan.so.1.0.0
 lib/libscanbtnd-interface_usb.so
 lib/libscanbtnd-interface_usb.so.1
+lib/libscanbtnd-interface_usb.so.1.0.0
 @dirrm etc/scanbuttond