[Bug 190667] New: german/bbbike: stage directory support

[bz-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=190667

            Bug ID: 190667
           Summary: german/bbbike: stage directory support
           Product: Ports Tree
           Version: Latest
          Hardware: Any
                OS: Any
            Status: Needs Triage
          Severity: Affects Only Me
          Priority: Normal
         Component: Individual Port(s)
          Assignee: freebsd-ports-bugs at FreeBSD.org
          Reporter: slaven at rezic.de



Fix:
diff -ruN /usr/ports/german/BBBike/Makefile ./Makefile
--- /usr/ports/german/BBBike/Makefile    2014-05-05 11:45:36.000000000 +0200
+++ ./Makefile    2014-06-05 20:51:34.000000000 +0200
@@ -18,14 +18,11 @@
 USES=        perl5
 POD2MAN=    pod2man

-MAN1=        bbbike.1
-
-MYDESTDIR=    ${PREFIX}/BBBike
+MYDESTDIR=    ${STAGEDIR}${PREFIX}/BBBike

 LOCAL_PERL_ARCH=    ${PERL_ARCH}
 PLIST_SUB=        LOCAL_PERL_ARCH=${LOCAL_PERL_ARCH}

-NO_STAGE=    yes
 do-build:
     cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} all install
     cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} clean
@@ -46,14 +43,14 @@

 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
+    -${RM} -f ${STAGEDIR}${PREFIX}/bin/$f
+    ${LN} -s  ../BBBike/$f ${STAGEDIR}${PREFIX}/bin/$f
 .endfor

 .include <bsd.port.mk>
diff -ruN /usr/ports/german/BBBike/pkg-plist.in ./pkg-plist.in
--- /usr/ports/german/BBBike/pkg-plist.in    2013-07-06 11:18:27.000000000
+0200
+++ ./pkg-plist.in    2014-06-05 20:51:34.000000000 +0200
@@ -209,19 +209,16 @@
 BBBike/Way/Metric.pm
 BBBike/Wizards.pm
 BBBike/bbbike
- at exec ln -fs %D/%F %D/bin/bbbike
- at 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
- at exec ln -fs %D/%F %D/bin/bbbikeclient
- at unexec rm -f %D/bin/bbbikeclient
+bin/bbbikeclient
 BBBike/cbbbike
- at exec ln -fs %D/%F %D/bin/cbbbike
- at 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.config
 BBBike/cgi/wapbbbike.cgi
 BBBike/cmdbbbike
- at exec ln -fs %D/%F %D/bin/cmdbbbike
- at 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/MerkaartorPlugin.pm
 BBBike/plugins/MultiMap.pm
 BBBike/smsbbbike
- at exec ln -fs %D/%F %D/bin/smsbbbike
- at 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

-- 
You are receiving this mail because:
You are the assignee for the bug.