Stagify a bunch of ports maintained by flz

While here:
- graphics/icoconvert:
  * Respect CC
  * Use modern LIB_DEPENDS
- net/grdesktop:
  * Convert gnomehack to pathfix
- net/ldapsh:
  * Use shebangfix instead of custom post-patch target
- net-im/py-jabber:
  * Use autoplist
- net-p2p/bnbt:
  * Use the options framework
  * Convert to dos2unix
  * Respect CXX
  * Do not renamed base on option
- sysutils/testdisk:
  * Update to 6.14
  * Use options helpers
  * Use modern LIB_DEPENDS
  * Convert USE_BZIP2 -> USES=tar:bzip2

1 files changed, 19 insertions, 21 deletions

diff --git a/net-p2p/bnbt/Makefile b/net-p2p/bnbt/Makefile
index 35cfccf5f75e..bc71c2b9f2fe 100644
--- a/net-p2p/bnbt/Makefile
+++ b/net-p2p/bnbt/Makefile
@@ -3,54 +3,52 @@
 
 PORTNAME=	bnbt
 PORTVERSION=	8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://opensource.depthstrike.com/${PORTNAME}/
 DISTNAME=	${SNAPSHOT}-${PORTNAME}${PORTVERSION:C/\.//}-src
 SNAPSHOT=	20060727
 
 MAINTAINER=	flz@FreeBSD.org
-COMMENT=	A C++ BitTorrent Tracker
+COMMENT=	C++ BitTorrent Tracker
 
-USES=		gmake tar:bzip2
-USE_DOS2UNIX=	yes
+OPTIONS_DEFINE=	MYSQL DOCS
+
+USES=		dos2unix gmake tar:bzip2
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	bnbt
 
 PORTDOCS=	footer.html header.html
 
-.if defined(WITH_MYSQL)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
 ALL_TARGET=	bnbtmysql
-PKGNAMESUFFIX=	-mysql
 USE_MYSQL=	yes
 .else
 ALL_TARGET=	bnbt
 .endif
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS} -I${PREFIX}/include| ; \
-		s|LFLAGS =|LFLAGS = -L${PREFIX}/lib/mysql|' ${WRKSRC}/Makefile
+		s|LFLAGS =|LFLAGS = -L${PREFIX}/lib/mysql| ;  \
+		s|g++|${CXX}|' \
+		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|\([a-z]*\.bnbt\)|${PREFIX}/etc/${PORTNAME}/\1|' \
 		${WRKSRC}/config.cpp
 	@${REINPLACE_CMD} -e 's|bnbt.cfg|${PREFIX}/etc/${PORTNAME}/bnbt.cfg|' \
 		${WRKSRC}/config.h ${WRKSRC}/config.cpp ${WRKSRC}/tracker.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${PREFIX}/bin/bnbt
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${STAGEDIR}${PREFIX}/bin/bnbt
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-
-post-install:
-	@${MKDIR} /var/log/${PORTNAME}
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
+	${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/.keep
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${TOUCH} ${STAGEDIR}${ETCDIR}/.keep
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>