Stage german/BBBike

PR:		190667
Submitted by:	maintainer (Slaven Rezic)

3 files changed, 30 insertions, 62 deletions

diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index b06b9e70b82e..dbe0bd8faa94 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -13,47 +13,45 @@ COMMENT=	Route-finder for cyclists in Berlin and Brandenburg
 BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
 		p5-CDB_File>=0:${PORTSDIR}/databases/p5-CDB_File
 RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		${BUILD_DEPENDS}
+p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
+		p5-CDB_File>=0:${PORTSDIR}/databases/p5-CDB_File
 
 USES=		perl5
 POD2MAN=	pod2man
 
-MAN1=		bbbike.1
+MYDESTDIR=	${STAGEDIR}${PREFIX}/BBBike
 
-MYDESTDIR=	${PREFIX}/BBBike
+.include <bsd.port.pre.mk>
 
-LOCAL_PERL_ARCH=	${PERL_ARCH}
+LOCAL_PERL_ARCH!=	${PERL5} -MConfig -e '$$x = qq{$$Config{version}/$$Config{archname}}; $$x =~ s{/}{\\\\/}g; print $$x'
 PLIST_SUB=		LOCAL_PERL_ARCH=${LOCAL_PERL_ARCH}
+BBBIKE_PERL_EXE=	bbbike cbbbike bbbikeclient cmdbbbike smsbbbike
 
-NO_STAGE=	yes
 do-build:
 	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} all install
 	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} clean
+	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${CHMOD} u+w
+	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${STRIP_CMD}
+	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${CHMOD} u-w
 	cd ${WRKSRC}; ${POD2MAN} --lax bbbike.pod > bbbike.1
-	${MV} ${WRKSRC}/bbbike ${WRKSRC}/bbbike.tmp
-	${ECHO_CMD} "#! ${PERL}" > ${WRKSRC}/bbbike
-	${CAT} ${WRKSRC}/bbbike.tmp >> ${WRKSRC}/bbbike
-	${RM} -f ${WRKSRC}/bbbike.tmp
-	${CHMOD} 0755 ${WRKSRC}/bbbike
-
-BBBIKEEXE=	bbbike cbbbike bbbikeclient cmdbbbike smsbbbike
-PLIST_IN=	${PKGDIR}/pkg-plist.in
-PLIST=		${WRKDIR}/pkg-plist
-
-pre-install:
-	LOCAL_PERL_ARCH=`${PERL5} -MConfig -e '$$x = qq{$$Config{version}/$$Config{archname}}; $$x =~ s{/}{\\\\/}g; print $$x'`; \
-	${SED} -e "s/%%LOCAL_PERL_ARCH%%/$$LOCAL_PERL_ARCH/g" < ${PLIST_IN} > ${PLIST}
+.for f in ${BBBIKE_PERL_EXE}
+	${MV} ${WRKSRC}/$f ${WRKSRC}/$f.tmp
+	${ECHO_CMD} "#! ${PERL}" > ${WRKSRC}/$f
+	${CAT} ${WRKSRC}/$f.tmp >> ${WRKSRC}/$f
+	${RM} -f ${WRKSRC}/$f.tmp
+	${CHMOD} 0755 ${WRKSRC}/$f
+.endfor
 
 do-install:
 	-${RM} -rf ${MYDESTDIR}
-	${INSTALL_MAN} ${WRKSRC}/bbbike.1 ${PREFIX}/man/man1
-	${CP} -r ${WRKSRC} ${MYDESTDIR}
+	${INSTALL_MAN} ${WRKSRC}/bbbike.1 ${STAGEDIR}${PREFIX}/man/man1
+	${FIND} ${WRKSRC} | ${XARGS} ${CHMOD} ugo+r
+	${FIND} ${WRKSRC} -perm -u=x | ${XARGS} ${CHMOD} go+x
+	${CP} -rp ${WRKSRC} ${MYDESTDIR}
 	${RM} -f ${MYDESTDIR}/bbbike.1
-	${FIND} ${MYDESTDIR} | ${XARGS} ${CHMOD} ugo+r
-	${FIND} ${MYDESTDIR} -perm -u=x | ${XARGS} ${CHMOD} go+x
-.for f in ${BBBIKEEXE}
-	-${RM} -f ${PREFIX}/bin/$f
-	${LN} -s  ${MYDESTDIR}/$f ${PREFIX}/bin/$f
+.for f in ${BBBIKE_PERL_EXE}
+	-${RM} -f ${STAGEDIR}${PREFIX}/bin/$f
+	${LN} -s  ../BBBike/$f ${STAGEDIR}${PREFIX}/bin/$f
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/german/BBBike/pkg-descr b/german/BBBike/pkg-descr
index cf5b0f635a34..569612828b9b 100644
--- a/german/BBBike/pkg-descr
+++ b/german/BBBike/pkg-descr
@@ -11,36 +11,10 @@ Brandenburg (Germany). It has the following features:
 
 * Displays a map with streets, railways, rivers, parks, altitude, and 
   other features 
-
 * Finds and shows routes between two points
-
 * Route-finder can be customized to match the cyclist's preferences: 
   fastest/nicest route, take wind directions and hills into account, etc.)
-
 * Bike power calculator 
-
 * Automatically fetches the current Berlin weather data
 
-------------------------------------------------------------------------
-
-Mit BBBike koennen Fahrrad-Routen in Berlin und Umgebung automatisch
-oder manuell erstellt werden.
-
-BBBike liefert unter anderem die Antwort auf folgende Fragen:
-
-* Wie lang ist die Strecke von A nach B?
-
-* Wie schnell komme ich von A nach B, wenn ich durchschnittlich 15
-  km/h schnell fahre?
-
-* Wie lange brauche ich von A nach B, wenn ich mit 100 Watt Leistung
-  fahre, mit Beruecksichtigung des aktuellen Windes und von
-  Steigungen auf der Strecke?
-
-* Auf welchen Strassen fahre ich, wenn ich von A nach B kommen will?
-
-* Wo habe ich Gegenwind- und Rueckenwindstrecken?
-
-* Wo gibt es Steigungen und Gefaelle?
-
 WWW: http://bbbike.sourceforge.net
diff --git a/german/BBBike/pkg-plist.in b/german/BBBike/pkg-plist
index efb7e75b3825..ead6335a6738 100644
--- a/german/BBBike/pkg-plist.in
+++ b/german/BBBike/pkg-plist
@@ -209,19 +209,16 @@ BBBike/Way.pm
 BBBike/Way/Metric.pm
 BBBike/Wizards.pm
 BBBike/bbbike
-@exec ln -fs %D/%F %D/bin/bbbike
-@unexec rm -f %D/bin/bbbike
+bin/bbbike
 BBBike/bbbike-activeperl.bat
 BBBike/bbbike-fast.bat
 BBBike/bbbike.bat
 BBBike/bbbike.pod
 BBBike/bbbikeapplet
 BBBike/bbbikeclient
-@exec ln -fs %D/%F %D/bin/bbbikeclient
-@unexec rm -f %D/bin/bbbikeclient
+bin/bbbikeclient
 BBBike/cbbbike
-@exec ln -fs %D/%F %D/bin/cbbbike
-@unexec rm -f %D/bin/cbbbike
+bin/cbbbike
 BBBike/cbbbike.bat
 BBBike/cgi/README
 BBBike/cgi/bbbike-data.cgi
@@ -248,8 +245,7 @@ BBBike/cgi/tinyhttpd
 BBBike/cgi/tinyhttpd.config
 BBBike/cgi/wapbbbike.cgi
 BBBike/cmdbbbike
-@exec ln -fs %D/%F %D/bin/cmdbbbike
-@unexec rm -f %D/bin/cmdbbbike
+bin/cmdbbbike
 BBBike/data/.modified
 BBBike/data/Berlin.coords.data
 BBBike/data/Potsdam.coords.data
@@ -1077,10 +1073,10 @@ BBBike/plugins/KaupertsPlugin.pm
 BBBike/plugins/MerkaartorPlugin.pm
 BBBike/plugins/MultiMap.pm
 BBBike/smsbbbike
-@exec ln -fs %D/%F %D/bin/smsbbbike
-@unexec rm -f %D/bin/smsbbbike
+bin/smsbbbike
 BBBike/tkbikepwr
 BBBike/tmp/.keep_me
+man/man1/bbbike.1.gz
 BBBike/lib/%%LOCAL_PERL_ARCH%%/BBBikeXS.pm
 BBBike/lib/%%LOCAL_PERL_ARCH%%/Strassen/Inline.pm
 BBBike/lib/%%LOCAL_PERL_ARCH%%/Strassen/Inline2.pm