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

4 files changed, 14 insertions, 19 deletions

diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index b189a8aed060..6cdfc9b0123c 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -14,21 +14,18 @@ COMMENT=	GNOME frontend for the remote desktop client (rdesktop)
 RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
-USE_GNOME=	libgnomeui gnomeprefix gnomehack
+USES=		pathfix gmake pkgconfig
+USE_GNOME=	libgnomeui gnomeprefix
 GCONF_SCHEMAS=	grdesktop.schemas
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-keymap-path=${LOCALBASE}/share/rdesktop/keymaps
 
-MAN1=		grdesktop.1
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(GETTEXT_PACKAGE =\).*|\1 grdesktop|' ${WRKSRC}/po/Makefile.in.in
 
 post-install:
-	@${INSTALL_DATA} ${PREFIX}/share/pixmaps/grdesktop/icon.png ${PREFIX}/share/pixmaps/grdesktop.png
+	@${INSTALL_DATA} ${STAGEDIR}${PREFIX}/share/pixmaps/grdesktop/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/grdesktop.png
 
 .include <bsd.port.mk>
diff --git a/net/grdesktop/pkg-plist b/net/grdesktop/pkg-plist
index eabd4f9d978e..c6208f979dfa 100644
--- a/net/grdesktop/pkg-plist
+++ b/net/grdesktop/pkg-plist
@@ -1,4 +1,5 @@
 bin/grdesktop
+man/man1/grdesktop.1.gz
 share/application-registry/grdesktop.applications
 share/applications/grdesktop.desktop
 share/gnome/help/grdesktop/C/grdesktop.xml
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index 94e0fd2e7cea..9cc841c3749a 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -21,21 +21,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES=	pkg-message
 
-MAN1=		ldapsh.1
-MAN3=		Net::LDAP::Shell.3 Net::LDAP::Config.3 \
-		Net::LDAP::Shell::Parse.3 Net::LDAP::Shell::Util.3
-
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	configure
-
-NO_STAGE=	yes
-post-patch:
-	${REINPLACE_CMD} -e "s,/usr/local/bin/perl,${PERL}," ${WRKSRC}/ldapsh
+SHEBANG_FILES=	ldapsh
 
 post-install:
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/COMMANDS ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${EXAMPLESDIR}/
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/COMMANDS ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/net/ldapsh/pkg-plist b/net/ldapsh/pkg-plist
index ec5a6e113adc..c4c45fea674d 100644
--- a/net/ldapsh/pkg-plist
+++ b/net/ldapsh/pkg-plist
@@ -20,6 +20,11 @@ bin/ldapsh
 %%SITE_PERL%%/Net/LDAP/Shell/Util.pm
 %%SITE_PERL%%/Net/LDAP/Shell/grammar.yp
 %%SITE_PERL%%/Net/LDAP/Shell/makefile
+%%PERL5_MAN3%%/Net::LDAP::Config.3.gz
+%%PERL5_MAN3%%/Net::LDAP::Shell.3.gz
+%%PERL5_MAN3%%/Net::LDAP::Shell::Parse.3.gz
+%%PERL5_MAN3%%/Net::LDAP::Shell::Util.3.gz
+man/man1/ldapsh.1.gz
 %%DOCSDIR%%/COMMANDS
 %%EXAMPLESDIR%%/ldapsh_config
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ldapsh