Bug 90258 - Update of german/BBBike port
Summary: Update of german/BBBike port
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Edwin Groothuis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-12-11 20:40 UTC by Slaven Rezic
Modified: 2005-12-26 10:54 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Slaven Rezic 2005-12-11 20:40:12 UTC
	Update from 3.14 to 3.15.

Fix: # 
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####

#### Patch data follows ####


#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Sun Dec 11 21:22:25 2005
# Generated by        : makepatch 2.00_05
# Recurse directories : Yes
# p 'Makefile' 2239 1134332320 0100644
# p 'distinfo' 96 1134332320 0100644
# p 'pkg-plist.in' 24810 1134332320 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Sun Dec 11 21:22:25 2005] ####
#### Patch checksum: 306 10434 10331 ####
#### Checksum: 324 11060 61939 ####--94GpBbkl2SUsep9vGcRiN305vyiVnPxgDoGFgYhq8hrDAGsy
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -up '/usr/ports/german/BBBike/Makefile' '/tmp/BBBike/Makefile'
Index: ./Makefile
--- ./Makefile	Wed Oct  5 03:02:54 2005
+++ ./Makefile	Sun Dec 11 21:18:40 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	BBBike
-PORTVERSION=	3.14
+PORTVERSION=	3.15
 CATEGORIES=	german
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bbbike
@@ -33,8 +33,6 @@ LOCAL_PERL_ARCH=	${PERL_VER}/${ARCH}-fre
 .endif
 PLIST_SUB=		LOCAL_PERL_ARCH=${LOCAL_PERL_ARCH}
 
-.include <bsd.port.pre.mk>
-
 do-build:
 	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} all install
 	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} clean
@@ -51,11 +49,11 @@ PLIST=		${WRKDIR}/pkg-plist
 
 pre-install:
 .if !defined(PERL_VER) || ${PERL_VER} == 5.005
-	LOCAL_PERL_ARCH=`${PERL5} -MConfig -e 'print "$$Config{archname}"'`; \
-	${SED} -e "s|%%LOCAL_PERL_ARCH%%|$$LOCAL_PERL_ARCH|g" < ${PLIST_IN} > ${PLIST}
+	LOCAL_PERL_ARCH=`${PERL5} -MConfig -e '$$x = qq{$$Config{archname}}; $$x =~ s{/}{\\\\/}g; print $$x'`; \
+	${SED} -e "s/%%LOCAL_PERL_ARCH%%/$$LOCAL_PERL_ARCH/g" < ${PLIST_IN} > ${PLIST}
 .else
-	LOCAL_PERL_ARCH=`${PERL5} -MConfig -e 'print "$$Config{version}/$$Config{archname}"'`; \
-	${SED} -e "s|%%LOCAL_PERL_ARCH%%|$$LOCAL_PERL_ARCH|g" < ${PLIST_IN} > ${PLIST}
+	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}
 .endif
 
 do-install:
@@ -70,4 +68,4 @@ do-install:
 	${LN} -s  ${MYDESTDIR}/$f ${PREFIX}/bin/$f
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -up '/usr/ports/german/BBBike/distinfo' '/tmp/BBBike/distinfo'
Index: ./distinfo
--- ./distinfo	Wed Oct  5 03:02:54 2005
+++ ./distinfo	Sun Dec 11 21:18:40 2005
@@ -1,2 +1,2 @@
-MD5 (BBBike-3.14.tar.gz) = a3fa5908f9995d6848fe011798af7801
-SIZE (BBBike-3.14.tar.gz) = 2361829
+MD5 (BBBike-3.15.tar.gz) = 9ae63b49f49c52e23fc0017d9c22ca59
+SIZE (BBBike-3.15.tar.gz) = 2643229
diff -up '/usr/ports/german/BBBike/pkg-plist.in' '/tmp/BBBike/pkg-plist.in'
Index: ./pkg-plist.in
--- ./pkg-plist.in	Wed Oct  5 03:02:56 2005
+++ ./pkg-plist.in	Sun Dec 11 21:18:40 2005
@@ -2,6 +2,7 @@ BBBike/Ampelschaltung.pm
 BBBike/BBBikeAdvanced.pm
 BBBike/BBBikeAlarm.pm
 BBBike/BBBikeCalc.pm
+BBBike/BBBikeCrosshairs.pm
 BBBike/BBBikeDebug.pm
 BBBike/BBBikeDraw.pm
 BBBike/BBBikeDraw/GD.pm
@@ -64,10 +65,11 @@ BBBike/GPS/DirectGarmin.pm
 BBBike/GPS/G7toWin_2.pm
 BBBike/GPS/G7toWin_ASCII.pm
 BBBike/GPS/Gardown.pm
+BBBike/GPS/Gpsbabel.pm
 BBBike/GPS/GpsmanConn.pm
 BBBike/GPS/GpsmanData.pm
 BBBike/GPS/MPS.pm
-BBBike/GPS/NMEA.pm
+BBBike/GPS/MyNMEA.pm
 BBBike/GPS/Ovl.pm
 BBBike/GPS/SerialStty.pm
 BBBike/GPS/Unknown1.pm
@@ -141,8 +143,11 @@ BBBike/Strassen/DB_File_Btree.pm
 BBBike/Strassen/Dataset.pm
 BBBike/Strassen/E00.pm
 BBBike/Strassen/ESRI.pm
+BBBike/Strassen/Edit.pm
 BBBike/Strassen/Ext.pm
 BBBike/Strassen/Fast.pm
+BBBike/Strassen/FromRoute.pm
+BBBike/Strassen/GPX.pm
 BBBike/Strassen/Gardown.pm
 BBBike/Strassen/Generated.pm
 BBBike/Strassen/Generated_src.pm
@@ -193,8 +198,10 @@ BBBike/cbbbike
 @unexec rm -f %D/bin/cbbbike
 BBBike/cbbbike.bat
 BBBike/cgi/README
+BBBike/cgi/bbbike-data.cgi
 BBBike/cgi/bbbike-teaser.pl
 BBBike/cgi/bbbike.cgi
+BBBike/cgi/bbbikegooglemap.cgi
 BBBike/cgi/berlinmap.cgi
 BBBike/cgi/configure-bbbike.cgi
 BBBike/cgi/httpd.conf.tpl
@@ -226,6 +233,7 @@ BBBike/data/comments_misc
 BBBike/data/comments_mount
 BBBike/data/comments_path
 BBBike/data/comments_route
+BBBike/data/comments_scenic
 BBBike/data/comments_tram
 BBBike/data/deutschland
 BBBike/data/faehren
@@ -247,7 +255,6 @@ BBBike/data/innerberliner_grenze
 BBBike/data/kneipen
 BBBike/data/label
 BBBike/data/landstrassen
-BBBike/data/landstrassen.desc
 BBBike/data/landstrassen2
 BBBike/data/mount
 BBBike/data/multi_bez_str
@@ -268,9 +275,7 @@ BBBike/data/rbahnhof
 BBBike/data/sbahn
 BBBike/data/sbahnhof
 BBBike/data/sbahnhof_bg
-BBBike/data/sbahnhof_bg.desc
 BBBike/data/sehenswuerdigkeit
-BBBike/data/sehenswuerdigkeit.desc
 BBBike/data/sehenswuerdigkeit_img/brandenburger_tor.gif
 BBBike/data/sehenswuerdigkeit_img/fernsehturm.gif
 BBBike/data/sehenswuerdigkeit_img/funkturm.gif
@@ -283,11 +288,10 @@ BBBike/data/sehenswuerdigkeit_img/schult
 BBBike/data/sehenswuerdigkeit_img/siegessaeule.gif
 BBBike/data/sehenswuerdigkeit_img/viktoriaparkdenkmal.gif
 BBBike/data/strassen
-BBBike/data/strassen.desc
+BBBike/data/strassen_bab
 BBBike/data/ubahn
 BBBike/data/ubahnhof
 BBBike/data/ubahnhof_bg
-BBBike/data/ubahnhof_bg.desc
 BBBike/data/umsteigebhf
 BBBike/data/vorfahrt
 BBBike/data/wasserstrassen
@@ -332,7 +336,6 @@ BBBike/ext/StrassenNetz-CNetFile/ppport.
 BBBike/ext/StrassenNetz-CNetFile/t/base.t
 BBBike/ext/VectorUtil-Inline/Inline.pm
 BBBike/ext/VectorUtil-Inline/Inline.xs
-BBBike/ext/VectorUtil-Inline/InlineDist.pm
 BBBike/ext/VectorUtil-Inline/Makefile.PL
 BBBike/ext/VectorUtil-Inline/t/point_in_poly.t
 BBBike/ext/VectorUtil-Inline/t/vectorutil.t
@@ -367,6 +370,7 @@ BBBike/html/newstreetform.html
 BBBike/html/newstreetform.tpl.html
 BBBike/html/pleasewait.html
 BBBike/html/presse.html
+BBBike/html/sprintf.js
 BBBike/images/PoweredByPerl.gif
 BBBike/images/abc.gif
 BBBike/images/abc.xpm
@@ -391,6 +395,17 @@ BBBike/images/ampel_klein2_rahmen.gif
 BBBike/images/ampel_klein2_rahmen.png
 BBBike/images/ampel_klein2_rahmen.xpm
 BBBike/images/ampel_klein_grey.xpm
+BBBike/images/ampelf.gif
+BBBike/images/ampelf.png
+BBBike/images/ampelf.xpm
+BBBike/images/ampelf_klein.gif
+BBBike/images/ampelf_klein.png
+BBBike/images/ampelf_klein.xpm
+BBBike/images/ampelf_klein2.gif
+BBBike/images/ampelf_klein2.png
+BBBike/images/ampelf_klein2.xpm
+BBBike/images/ampelf_klein_noalpha.png
+BBBike/images/ampelf_noalpha.png
 BBBike/images/andreaskr.gif
 BBBike/images/andreaskr.png
 BBBike/images/andreaskr.xpm
@@ -429,6 +444,9 @@ BBBike/images/bw_hright.wbmp
 BBBike/images/bw_left.wbmp
 BBBike/images/bw_right.wbmp
 BBBike/images/bw_straight.wbmp
+BBBike/images/car.gif
+BBBike/images/car.png
+BBBike/images/car.xpm
 BBBike/images/cgi_legende.gif
 BBBike/images/cgi_legende.xpm
 BBBike/images/church.gif
@@ -438,6 +456,7 @@ BBBike/images/click.gif
 BBBike/images/click.xpm
 BBBike/images/cross.gif
 BBBike/images/cross.xpm
+BBBike/images/crosses.xbm
 BBBike/images/delete_ovl.gif
 BBBike/images/delnet_ptr.xbm
 BBBike/images/delnet_ptr_mask.xbm
@@ -461,6 +480,7 @@ BBBike/images/flaechen.xpm
 BBBike/images/flag2_bl.gif
 BBBike/images/flag2_bl.jpg
 BBBike/images/flag2_bl.png
+BBBike/images/flag2_bl.wbmp
 BBBike/images/flag2_bl.xpm
 BBBike/images/flag2_bl_centered.gif
 BBBike/images/flag2_bl_centered.png
@@ -491,6 +511,7 @@ BBBike/images/hatched_ring.xpm
 BBBike/images/help.gif
 BBBike/images/help.xpm
 BBBike/images/hospital.gif
+BBBike/images/hospital.png
 BBBike/images/hospital.xpm
 BBBike/images/info.gif
 BBBike/images/info.xpm
@@ -512,10 +533,15 @@ BBBike/images/kopfstein_klein_grey.xpm
 BBBike/images/landstrasse.gif
 BBBike/images/landstrasse.xpm
 BBBike/images/legend_blocked.gif
+BBBike/images/legend_blocked.png
 BBBike/images/legend_blockedroute.gif
+BBBike/images/legend_blockedroute.png
 BBBike/images/legend_carry.gif
+BBBike/images/legend_carry.png
 BBBike/images/legend_narrowpassage.gif
+BBBike/images/legend_narrowpassage.png
 BBBike/images/legend_oneway.gif
+BBBike/images/legend_oneway.png
 BBBike/images/lightning.gif
 BBBike/images/lightning_cursor.xbm
 BBBike/images/map.gif
@@ -526,10 +552,16 @@ BBBike/images/minicross.png
 BBBike/images/monument.gif
 BBBike/images/monument.xpm
 BBBike/images/moon.xpm
+BBBike/images/mosque.gif
+BBBike/images/mosque.png
+BBBike/images/mosque.xpm
 BBBike/images/movehand.gif
 BBBike/images/movehand.xpm
 BBBike/images/movehand_ptr.xbm
 BBBike/images/movehand_ptr_mask.xbm
+BBBike/images/newlayer.gif
+BBBike/images/newlayer.png
+BBBike/images/newlayer.xpm
 BBBike/images/open.gif
 BBBike/images/open.xpm
 BBBike/images/open_ovl.gif
@@ -609,7 +641,13 @@ BBBike/images/strasse.gif
 BBBike/images/strasse.xpm
 BBBike/images/strlist.gif
 BBBike/images/strlist.xpm
+BBBike/images/synagogue.gif
+BBBike/images/synagogue.png
+BBBike/images/synagogue.xpm
 BBBike/images/thunder_cursor.xbm
+BBBike/images/touristinfo.gif
+BBBike/images/touristinfo.png
+BBBike/images/touristinfo.xpm
 BBBike/images/ubahn.gif
 BBBike/images/ubahn.jpg
 BBBike/images/ubahn.png
@@ -656,6 +694,8 @@ BBBike/images/windrose.gif
 BBBike/images/windrose.xpm
 BBBike/images/windrose2.gif
 BBBike/images/windrose2.xpm
+BBBike/images/www_ptr.xbm
+BBBike/images/www_ptr_mask.xbm
 BBBike/images/xy_ptr.xbm
 BBBike/images/xy_ptr_mask.xbm
 BBBike/images/ziel.gif
@@ -722,6 +762,7 @@ BBBike/lib/Tk/LayerEditor.pm
 BBBike/lib/Tk/LayerEditorCore.pm
 BBBike/lib/Tk/LayerEditorToplevel.pm
 BBBike/lib/Tk/LogScale.pm
+BBBike/lib/Tk/LongDialog.pm
 BBBike/lib/Tk/PathEntry.pm
 BBBike/lib/Tk/PathEntry/Dialog.pm
 BBBike/lib/Tk/Placement.pm
@@ -788,11 +829,8 @@ BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/BBBi
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/BBBikeXS/BBBikeXS.so
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/Strassen/Inline/Inline.bs
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/Strassen/Inline/Inline.so
-BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/Strassen/Inline2/Inline2.bs
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/Strassen/Inline2/Inline2.so
-BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/StrassenNetz/CNetFile/CNetFile.bs
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/StrassenNetz/CNetFile/CNetFile.so
-BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/VectorUtil/Inline/Inline.bs
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/VectorUtil/Inline/Inline.so
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/VirtArray/VirtArray.bs
 BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/VirtArray/VirtArray.so
@@ -813,7 +851,6 @@ BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/Virt
 @dirrm BBBike/data/sehenswuerdigkeit_img
 @dirrm BBBike/ext/StrassenNetz-CNetFile
 @dirrm BBBike/lib/%%LOCAL_PERL_ARCH%%
-@unexec rmdir %D/BBBike/lib/%%PERL_VER%% 2>/dev/null || true
 @dirrm BBBike/ext/VectorUtil-Inline/t
 @dirrm BBBike/ext/Strassen-Inline2/t
 @dirrm BBBike/ext/VectorUtil-Inline
#### End of Patch data ####
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2005-12-11 20:43:26 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 2 Slaven Rezic 2005-12-12 21:15:04 UTC
Edwin Groothuis <edwin@FreeBSD.org> writes:

> Maintainer of german/BBBike,
> 
> Please note that PR ports/90258 has just been submitted.
> 
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
> 
> The full text of the PR can be found at:
>     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/90258
> 

Err... I am the maintainer *and* the originator of the patch.

Regards,
        Slaven

-- 
Slaven Rezic - slaven <at> rezic <dot> de
  BBBike - route planner for cyclists in Berlin
  WWW version:                           http://www.bbbike.de
  Perl/Tk version for Unix and Windows:  http://bbbike.sourceforge.net
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2005-12-12 23:22:32 UTC
State Changed
From-To: feedback->open

Comment 4 Edwin Groothuis freebsd_committer freebsd_triage 2005-12-12 23:23:33 UTC
Class Changed
From-To: change-request->maintainer-update

Submitter is maintainer
Comment 5 Edwin Groothuis freebsd_committer freebsd_triage 2005-12-12 23:44:30 UTC
State Changed
From-To: open->feedback

=== Checking filesystem state 
list of extra files and directories in / (not present before this port was installed but present after it was deinstalled) 
2220991        8 drwxr-xr-x    4 root             wheel                2560 Dec 12 23:43 usr/local/BBBike 
760778        4 drwxr-xr-x    3 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/ext 
1394702        4 drwxr-xr-x    2 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/ext/VectorUtil-Inline 
1394721        4 -rw-r--r--    1 root             wheel                 282 Dec 12 23:43 usr/local/BBBike/ext/VectorUtil-Inline/InlineDist.pm 
1555006        4 drwxr-xr-x    3 root             wheel                1024 Dec 12 23:43 usr/local/BBBike/lib 
1555084        4 drwxr-xr-x    3 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7 
1555085        4 drwxr-xr-x    3 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int 
1555086        4 drwxr-xr-x    5 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto 
1555093        4 drwxr-xr-x    3 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/StrassenNetz 
1555094        4 drwxr-xr-x    2 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/StrassenNetz/CNetFile 
1555096        0 -r--r--r--    1 root             wheel                   0 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/StrassenNetz/CNetFile/CNetFile.bs 
1555097        4 drwxr-xr-x    3 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/Strassen 
1555101        4 drwxr-xr-x    2 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/Strassen/Inline2 
1555103        0 -r--r--r--    1 root             wheel                   0 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/Strassen/Inline2/Inline2.bs 
1555104        4 drwxr-xr-x    3 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/VectorUtil 
1555105        4 drwxr-xr-x    2 root             wheel                 512 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/VectorUtil/Inline 
1555107        0 -r--r--r--    1 root             wheel                   0 Dec 12 23:43 usr/local/BBBike/lib/5.8.7/i386-freebsd-64int/auto/VectorUtil/Inline/Inline.bs 


Comment 6 Edwin Groothuis freebsd_committer freebsd_triage 2005-12-12 23:44:30 UTC
Responsible Changed
From-To: freebsd-ports-bugs->edwin

I'll handle it with submitter
Comment 7 Slaven Rezic 2005-12-13 00:56:01 UTC
Edwin Groothuis <edwin@FreeBSD.org> writes:

> Synopsis: Update of german/BBBike port
> 
> State-Changed-From-To: open->feedback
> State-Changed-By: edwin
> State-Changed-When: Mon Dec 12 23:44:30 UTC 2005
> State-Changed-Why: 
> === Checking filesystem state
> list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
[...]

Oh. It seems that my version of Inline/Inline::C did not create some
of the .bs files, so I left them from the pkg-plist. After an upgrade
to 0.44 all .bs files will be created.

Here's a new patch, again against the current /usr/ports version.

Regards,
        Slaven

# 
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####

#### Patch data follows ####
diff -up '/usr/ports/german/BBBike/Makefile' '/tmp/BBBike/Makefile'
Index: ./Makefile
--- ./Makefile	Wed Oct  5 03:02:54 2005
+++ ./Makefile	Tue Dec 13 01:50:58 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	BBBike
-PORTVERSION=	3.14
+PORTVERSION=	3.15
 CATEGORIES=	german
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bbbike
@@ -33,8 +33,6 @@ LOCAL_PERL_ARCH=	${PERL_VER}/${ARCH}-fre
 .endif
 PLIST_SUB=		LOCAL_PERL_ARCH=${LOCAL_PERL_ARCH}
 
-.include <bsd.port.pre.mk>
-
 do-build:
 	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} all install
 	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} clean
@@ -51,11 +49,11 @@ PLIST=		${WRKDIR}/pkg-plist
 
 pre-install:
 .if !defined(PERL_VER) || ${PERL_VER} == 5.005
-	LOCAL_PERL_ARCH=`${PERL5} -MConfig -e 'print "$$Config{archname}"'`; \
-	${SED} -e "s|%%LOCAL_PERL_ARCH%%|$$LOCAL_PERL_ARCH|g" < ${PLIST_IN} > ${PLIST}
+	LOCAL_PERL_ARCH=`${PERL5} -MConfig -e '$$x = qq{$$Config{archname}}; $$x =~ s{/}{\\\\/}g; print $$x'`; \
+	${SED} -e "s/%%LOCAL_PERL_ARCH%%/$$LOCAL_PERL_ARCH/g" < ${PLIST_IN} > ${PLIST}
 .else
-	LOCAL_PERL_ARCH=`${PERL5} -MConfig -e 'print "$$Config{version}/$$Config{archname}"'`; \
-	${SED} -e "s|%%LOCAL_PERL_ARCH%%|$$LOCAL_PERL_ARCH|g" < ${PLIST_IN} > ${PLIST}
+	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}
 .endif
 
 do-install:
@@ -70,4 +68,4 @@ do-install:
 	${LN} -s  ${MYDESTDIR}/$f ${PREFIX}/bin/$f
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -up '/usr/ports/german/BBBike/distinfo' '/tmp/BBBike/distinfo'
Index: ./distinfo
--- ./distinfo	Wed Oct  5 03:02:54 2005
+++ ./distinfo	Tue Dec 13 01:50:59 2005
@@ -1,2 +1,2 @@
-MD5 (BBBike-3.14.tar.gz) = a3fa5908f9995d6848fe011798af7801
-SIZE (BBBike-3.14.tar.gz) = 2361829
+MD5 (BBBike-3.15.tar.gz) = 9ae63b49f49c52e23fc0017d9c22ca59
+SIZE (BBBike-3.15.tar.gz) = 2643229
diff -up '/usr/ports/german/BBBike/pkg-plist.in' '/tmp/BBBike/pkg-plist.in'
Index: ./pkg-plist.in
--- ./pkg-plist.in	Wed Oct  5 03:02:56 2005
+++ ./pkg-plist.in	Tue Dec 13 01:50:58 2005
@@ -2,6 +2,7 @@ BBBike/Ampelschaltung.pm
 BBBike/BBBikeAdvanced.pm
 BBBike/BBBikeAlarm.pm
 BBBike/BBBikeCalc.pm
+BBBike/BBBikeCrosshairs.pm
 BBBike/BBBikeDebug.pm
 BBBike/BBBikeDraw.pm
 BBBike/BBBikeDraw/GD.pm
@@ -64,10 +65,11 @@ BBBike/GPS/DirectGarmin.pm
 BBBike/GPS/G7toWin_2.pm
 BBBike/GPS/G7toWin_ASCII.pm
 BBBike/GPS/Gardown.pm
+BBBike/GPS/Gpsbabel.pm
 BBBike/GPS/GpsmanConn.pm
 BBBike/GPS/GpsmanData.pm
 BBBike/GPS/MPS.pm
-BBBike/GPS/NMEA.pm
+BBBike/GPS/MyNMEA.pm
 BBBike/GPS/Ovl.pm
 BBBike/GPS/SerialStty.pm
 BBBike/GPS/Unknown1.pm
@@ -141,8 +143,11 @@ BBBike/Strassen/DB_File_Btree.pm
 BBBike/Strassen/Dataset.pm
 BBBike/Strassen/E00.pm
 BBBike/Strassen/ESRI.pm
+BBBike/Strassen/Edit.pm
 BBBike/Strassen/Ext.pm
 BBBike/Strassen/Fast.pm
+BBBike/Strassen/FromRoute.pm
+BBBike/Strassen/GPX.pm
 BBBike/Strassen/Gardown.pm
 BBBike/Strassen/Generated.pm
 BBBike/Strassen/Generated_src.pm
@@ -193,8 +198,10 @@ BBBike/cbbbike
 @unexec rm -f %D/bin/cbbbike
 BBBike/cbbbike.bat
 BBBike/cgi/README
+BBBike/cgi/bbbike-data.cgi
 BBBike/cgi/bbbike-teaser.pl
 BBBike/cgi/bbbike.cgi
+BBBike/cgi/bbbikegooglemap.cgi
 BBBike/cgi/berlinmap.cgi
 BBBike/cgi/configure-bbbike.cgi
 BBBike/cgi/httpd.conf.tpl
@@ -226,6 +233,7 @@ BBBike/data/comments_misc
 BBBike/data/comments_mount
 BBBike/data/comments_path
 BBBike/data/comments_route
+BBBike/data/comments_scenic
 BBBike/data/comments_tram
 BBBike/data/deutschland
 BBBike/data/faehren
@@ -247,7 +255,6 @@ BBBike/data/innerberliner_grenze
 BBBike/data/kneipen
 BBBike/data/label
 BBBike/data/landstrassen
-BBBike/data/landstrassen.desc
 BBBike/data/landstrassen2
 BBBike/data/mount
 BBBike/data/multi_bez_str
@@ -268,9 +275,7 @@ BBBike/data/rbahnhof
 BBBike/data/sbahn
 BBBike/data/sbahnhof
 BBBike/data/sbahnhof_bg
-BBBike/data/sbahnhof_bg.desc
 BBBike/data/sehenswuerdigkeit
-BBBike/data/sehenswuerdigkeit.desc
 BBBike/data/sehenswuerdigkeit_img/brandenburger_tor.gif
 BBBike/data/sehenswuerdigkeit_img/fernsehturm.gif
 BBBike/data/sehenswuerdigkeit_img/funkturm.gif
@@ -283,11 +288,10 @@ BBBike/data/sehenswuerdigkeit_img/schult
 BBBike/data/sehenswuerdigkeit_img/siegessaeule.gif
 BBBike/data/sehenswuerdigkeit_img/viktoriaparkdenkmal.gif
 BBBike/data/strassen
-BBBike/data/strassen.desc
+BBBike/data/strassen_bab
 BBBike/data/ubahn
 BBBike/data/ubahnhof
 BBBike/data/ubahnhof_bg
-BBBike/data/ubahnhof_bg.desc
 BBBike/data/umsteigebhf
 BBBike/data/vorfahrt
 BBBike/data/wasserstrassen
@@ -332,7 +336,6 @@ BBBike/ext/StrassenNetz-CNetFile/ppport.
 BBBike/ext/StrassenNetz-CNetFile/t/base.t
 BBBike/ext/VectorUtil-Inline/Inline.pm
 BBBike/ext/VectorUtil-Inline/Inline.xs
-BBBike/ext/VectorUtil-Inline/InlineDist.pm
 BBBike/ext/VectorUtil-Inline/Makefile.PL
 BBBike/ext/VectorUtil-Inline/t/point_in_poly.t
 BBBike/ext/VectorUtil-Inline/t/vectorutil.t
@@ -367,6 +370,7 @@ BBBike/html/newstreetform.html
 BBBike/html/newstreetform.tpl.html
 BBBike/html/pleasewait.html
 BBBike/html/presse.html
+BBBike/html/sprintf.js
 BBBike/images/PoweredByPerl.gif
 BBBike/images/abc.gif
 BBBike/images/abc.xpm
@@ -391,6 +395,17 @@ BBBike/images/ampel_klein2_rahmen.gif
 BBBike/images/ampel_klein2_rahmen.png
 BBBike/images/ampel_klein2_rahmen.xpm
 BBBike/images/ampel_klein_grey.xpm
+BBBike/images/ampelf.gif
+BBBike/images/ampelf.png
+BBBike/images/ampelf.xpm
+BBBike/images/ampelf_klein.gif
+BBBike/images/ampelf_klein.png
+BBBike/images/ampelf_klein.xpm
+BBBike/images/ampelf_klein2.gif
+BBBike/images/ampelf_klein2.png
+BBBike/images/ampelf_klein2.xpm
+BBBike/images/ampelf_klein_noalpha.png
+BBBike/images/ampelf_noalpha.png
 BBBike/images/andreaskr.gif
 BBBike/images/andreaskr.png
 BBBike/images/andreaskr.xpm
@@ -429,6 +444,9 @@ BBBike/images/bw_hright.wbmp
 BBBike/images/bw_left.wbmp
 BBBike/images/bw_right.wbmp
 BBBike/images/bw_straight.wbmp
+BBBike/images/car.gif
+BBBike/images/car.png
+BBBike/images/car.xpm
 BBBike/images/cgi_legende.gif
 BBBike/images/cgi_legende.xpm
 BBBike/images/church.gif
@@ -438,6 +456,7 @@ BBBike/images/click.gif
 BBBike/images/click.xpm
 BBBike/images/cross.gif
 BBBike/images/cross.xpm
+BBBike/images/crosses.xbm
 BBBike/images/delete_ovl.gif
 BBBike/images/delnet_ptr.xbm
 BBBike/images/delnet_ptr_mask.xbm
@@ -461,6 +480,7 @@ BBBike/images/flaechen.xpm
 BBBike/images/flag2_bl.gif
 BBBike/images/flag2_bl.jpg
 BBBike/images/flag2_bl.png
+BBBike/images/flag2_bl.wbmp
 BBBike/images/flag2_bl.xpm
 BBBike/images/flag2_bl_centered.gif
 BBBike/images/flag2_bl_centered.png
@@ -491,6 +511,7 @@ BBBike/images/hatched_ring.xpm
 BBBike/images/help.gif
 BBBike/images/help.xpm
 BBBike/images/hospital.gif
+BBBike/images/hospital.png
 BBBike/images/hospital.xpm
 BBBike/images/info.gif
 BBBike/images/info.xpm
@@ -512,10 +533,15 @@ BBBike/images/kopfstein_klein_grey.xpm
 BBBike/images/landstrasse.gif
 BBBike/images/landstrasse.xpm
 BBBike/images/legend_blocked.gif
+BBBike/images/legend_blocked.png
 BBBike/images/legend_blockedroute.gif
+BBBike/images/legend_blockedroute.png
 BBBike/images/legend_carry.gif
+BBBike/images/legend_carry.png
 BBBike/images/legend_narrowpassage.gif
+BBBike/images/legend_narrowpassage.png
 BBBike/images/legend_oneway.gif
+BBBike/images/legend_oneway.png
 BBBike/images/lightning.gif
 BBBike/images/lightning_cursor.xbm
 BBBike/images/map.gif
@@ -526,10 +552,16 @@ BBBike/images/minicross.png
 BBBike/images/monument.gif
 BBBike/images/monument.xpm
 BBBike/images/moon.xpm
+BBBike/images/mosque.gif
+BBBike/images/mosque.png
+BBBike/images/mosque.xpm
 BBBike/images/movehand.gif
 BBBike/images/movehand.xpm
 BBBike/images/movehand_ptr.xbm
 BBBike/images/movehand_ptr_mask.xbm
+BBBike/images/newlayer.gif
+BBBike/images/newlayer.png
+BBBike/images/newlayer.xpm
 BBBike/images/open.gif
 BBBike/images/open.xpm
 BBBike/images/open_ovl.gif
@@ -609,7 +641,13 @@ BBBike/images/strasse.gif
 BBBike/images/strasse.xpm
 BBBike/images/strlist.gif
 BBBike/images/strlist.xpm
+BBBike/images/synagogue.gif
+BBBike/images/synagogue.png
+BBBike/images/synagogue.xpm
 BBBike/images/thunder_cursor.xbm
+BBBike/images/touristinfo.gif
+BBBike/images/touristinfo.png
+BBBike/images/touristinfo.xpm
 BBBike/images/ubahn.gif
 BBBike/images/ubahn.jpg
 BBBike/images/ubahn.png
@@ -656,6 +694,8 @@ BBBike/images/windrose.gif
 BBBike/images/windrose.xpm
 BBBike/images/windrose2.gif
 BBBike/images/windrose2.xpm
+BBBike/images/www_ptr.xbm
+BBBike/images/www_ptr_mask.xbm
 BBBike/images/xy_ptr.xbm
 BBBike/images/xy_ptr_mask.xbm
 BBBike/images/ziel.gif
@@ -722,6 +762,7 @@ BBBike/lib/Tk/LayerEditor.pm
 BBBike/lib/Tk/LayerEditorCore.pm
 BBBike/lib/Tk/LayerEditorToplevel.pm
 BBBike/lib/Tk/LogScale.pm
+BBBike/lib/Tk/LongDialog.pm
 BBBike/lib/Tk/PathEntry.pm
 BBBike/lib/Tk/PathEntry/Dialog.pm
 BBBike/lib/Tk/Placement.pm
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Tue Dec 13 01:54:26 2005
# Generated by        : makepatch 2.00_05
# Recurse directories : Yes
# p 'Makefile' 2239 1134435058 0100644
# p 'distinfo' 96 1134435059 0100644
# p 'pkg-plist.in' 24810 1134435058 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Tue Dec 13 01:54:26 2005] ####
#### Patch checksum: 286 9307 49436 ####
#### Checksum: 304 9932 35493 ####

-- 
Slaven Rezic - slaven <at> rezic <dot> de

Tk-AppMaster: a perl/Tk module launcher designed for handhelds
	http://tk-appmaster.sf.net
Comment 8 Edwin Groothuis freebsd_committer freebsd_triage 2005-12-20 12:40:55 UTC
State Changed
From-To: feedback->open

Committed, thanks!
Comment 9 Edwin Groothuis freebsd_committer freebsd_triage 2005-12-26 10:54:50 UTC
State Changed
From-To: open->closed

Committed, thanks!