diff -urN /usr/ports/deskutils/tpb/Makefile deskutils/tpb/Makefile
--- /usr/ports/deskutils/tpb/Makefile	2013-12-12 07:58:38.000000000 +0900
+++ deskutils/tpb/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -5,45 +5,49 @@
 PORTVERSION=	0.6.4
 PORTREVISION=	10
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	On-Screen-Display for hotkeys of IBM ThinkPads
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
 
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
 ONLY_FOR_ARCHS=	i386 amd64
 
+USES=		bison gmake iconv pkgconfig
 GNU_CONFIGURE=	yes
-USES=		bison iconv gmake pkgconfig
-
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 
-MAN1=		tpb.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALABASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
-PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/src/cfg.h \
-		${WRKSRC}/man/tpb.1
+.for i in man/tpb.1 src/cfg.h
+	@${REINPLACE_CMD} -e \
+		's|%%PREFIX%%|${PREFIX}|g ; \
+		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${i}
+.endfor
+	@${REINPLACE_CMD} -e \
+		's|void test()||' ${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/tpbrc ${PREFIX}/etc/tpbrc.default
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/callback_example.sh ${DOCSDIR}
-.endif
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} tpbrc \
+		${STAGEDIR}${PREFIX}/etc/tpbrc.default)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} callback_example.sh \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/deskutils/tpb/pkg-plist deskutils/tpb/pkg-plist
--- /usr/ports/deskutils/tpb/pkg-plist	2013-11-06 21:52:37.000000000 +0900
+++ deskutils/tpb/pkg-plist	2013-12-17 00:00:00.000000000 +0900
@@ -1,5 +1,6 @@
 bin/tpb
 etc/tpbrc.default
+man/man1/tpb.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/callback_example.sh
 %%NLS%%share/locale/da/LC_MESSAGES/tpb.mo
 %%NLS%%share/locale/de/LC_MESSAGES/tpb.mo