View | Details | Raw Unified | Return to bug 92277
Collapse All | Expand All

(-)Makefile (-5 / +1 lines)
Lines 57-66 Link Here
57 
.include <bsd.port.pre.mk>
 57 
.include <bsd.port.pre.mk>
58 
ALL_TARGET=	all
 58 
ALL_TARGET=	all
59 

          59
          

        

            

              60
              
.if ${OSVERSION} >= 502120

              
              
            

            

              61
              
BROKEN=		"Does not compile on FreeBSD >= 5.x"

            

            

              62
              
.endif

            

            

              63
              

            

        

          64
          
.if ${OSVERSION} < 500000

          60
          
.if ${OSVERSION} < 500000

        

        

          65
          
USE_GCC=	3.4

          61
          
USE_GCC=	3.4

        

        

          66
          
.endif

          62
          
.endif

        

  

    
      
            Lines 83-89
          
      
      
        Link Here
      
    
  

        

          83
          

          79
          

        

        

          84
          
.if !defined(WITH_SELFBUILT_FONTS)

          80
          
.if !defined(WITH_SELFBUILT_FONTS)

        

        

          85
          
post-configure:

          81
          
post-configure:

        

          
            

              86
              
	cd ${WRKSRC} && ${GMAKE} -C mf get-pfa


              82
              
	cd ${WRKSRC} && ${GMAKE} -C mf get-pfa DISTDIR=${DISTDIR}

            

        

          87
          
.endif

          83
          
.endif

        

        

          88
          

          84
          

        

        

          89
          
post-install:

          85
          
post-install:

        



(-)files/patch-mf:GNUMakefile
      (-1 / +1 lines)




  

    
      
            Lines 10-16
          
      
      
        Link Here
      
    
  

        

          10
          
 	@echo "For obtaining PFA fonts, either install mftrace "

          10
          
 	@echo "For obtaining PFA fonts, either install mftrace "

        

        

          11
          
 	@echo "(see http://www.xs4all.nl/~hanwen/mftrace/ ),"

          11
          
 	@echo "(see http://www.xs4all.nl/~hanwen/mftrace/ ),"

        

        

          12
          
-	@echo "or try one of the following commands in this directory: "

          12
          
-	@echo "or try one of the following commands in this directory: "

        

          
            

              13
              
+	@echo "or try one of the following commands in /usr/ports/print/lilypond/work/lilypond-2.2.2"


              13
              
+	@echo "or try one of the following commands in /usr/ports/print/lilypond/work/lilypond-$(TOPLEVEL_VERSION)"

            

        

          14
          
 	@echo ""

          14
          
 	@echo ""

        

        

          15
          
-	@echo " make get-pfa "

          15
          
-	@echo " make get-pfa "

        

        

          16
          
-	@echo " make get-rpm-pfa "

          16
          
-	@echo " make get-rpm-pfa "

        



(-)scripts/post-configure
      (-2 / +2 lines)




  

    
      
            Lines 7-14
          
      
      
        Link Here
      
    
  

        

          7
          
    gmake conf=$CONF -C lily $outdir/lexer.cc || true

          7
          
    gmake conf=$CONF -C lily $outdir/lexer.cc || true

        

        

          8
          

          8
          

        

        

          9
          
    mv $file $file.orig

          9
          
    mv $file $file.orig

        

          
            

              10
              
    sed -e 's/istream\*/std::istream*/g' \


              10
              
    sed -e 's/[^:]istream\*/std::istream*/g' \

            

            

              11
              
        -e 's/ostream\*/std::ostream*/g' \


              11
              
        -e 's/[^:]ostream\*/std::ostream*/g' \

            

        

          12
          
        -e 's/class istream;/#include \<iostream\>/g' \

          12
          
        -e 's/class istream;/#include \<iostream\>/g' \

        

        

          13
          
        $file.orig > $file

          13
          
        $file.orig > $file

        

        

          14
          
    echo "done"

          14
          
    echo "done"

        



(-)scripts/post-patch
      (-2 / +2 lines)




  

    
      
            Lines 13-20
          
      
      
        Link Here
      
    
  

        

          13
          
mkdir -p lily/$outdir

          13
          
mkdir -p lily/$outdir

        

        

          14
          
rm -f lily/$outdir/FlexLexer.h

          14
          
rm -f lily/$outdir/FlexLexer.h

        

        

          15
          
sed \

          15
          
sed \

        

          
            

              16
              
    -e 's/istream/std::istream/' \


              16
              
    -e 's/[^:]istream/std::istream/' \

            

            

              17
              
    -e 's/[^i]ostream/std::ostream/' \


              17
              
    -e 's/[^i:]ostream/std::ostream/' \

            

        

          18
          
    -e 's/iostream.h/iostream/' \

          18
          
    -e 's/iostream.h/iostream/' \

        

        

          19
          
    $file > lily/$outdir/FlexLexer.h

          19
          
    $file > lily/$outdir/FlexLexer.h

        

        

          20
          
echo "done"

          20
          
echo "done"

        






  

  Return to bug 92277