Attachment 131292 Details for Bug 175342 – file.diff

[patch] file.diff

file.diff (text/plain), 11.28 KB, created by mitsururike on 2013-01-16 05:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mitsururike

Created: 2013-01-16 05:50:00 UTC

Size: 11.28 KB

patch

obsolete

>diff -ruN scala.old/Makefile scala/Makefile
>--- scala.old/Makefile	2013-01-05 23:55:15.000000000 +0900
>+++ scala/Makefile	2013-01-10 09:06:30.000000000 +0900
>@@ -2,35 +2,43 @@
> # $FreeBSD: ports/lang/scala/Makefile,v 1.10 2012/12/10 13:24:59 svnexp Exp $
> 
> PORTNAME=	scala
>-PORTVERSION=	2.9.1
>+PORTVERSION=	2.10.0
> CATEGORIES=	lang java
>-MASTER_SITES=	http://www.scala-lang.org/downloads/distrib/files/ \
>-		LOCAL/glarkin
>-DISTNAME=	${PORTNAME}-${PORTVERSION}.final
>+MASTER_SITES=	http://www.scala-lang.org/downloads/distrib/files/
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	mitsururike@gmail.com
> COMMENT=	The Scala Programming Language
> 
>+LICENSE=	BSD
>+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
>+
> RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
> 
> NO_BUILD=	yes
> USE_JAVA=	yes
> JAVA_VERSION=	1.6+
> 
>-MAN1=		fsc.1 sbaz.1 scala.1 scalac.1 scaladoc.1 scalap.1
>-
> SCALA_HOME=	${DATADIR}
>-SCALA_SHRDIRS=	lib meta misc
>+SCALA_SHRDIRS=	lib misc src
>+SCALA_DOCDIRS=	tools
> SCALA_BINS=	fsc \
>-		sbaz \
>-		sbaz-setup \
> 		scala \
> 		scalac \
> 		scaladoc \
> 		scalap
> 
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE=		DOCS EXAMPLES
>+OPTIONS_DEFAULT=	DOCS EXAMPLES
>+
>+MAN1=		${SCALA_BINS:S,$,.1,}
>+PLIST_FILES=	${SCALA_BINS:S,^,bin/,}
>+
>+PORTDATA=	*
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
>+
>+.include <bsd.port.options.mk>
> 
> pre-patch:
> 	@${ECHO_MSG} "Installation settings:"
>@@ -43,24 +51,28 @@
> .endfor
> 
> do-install:
>-	@${ECHO_MSG} ">> Installing Scala files..."
>-	@${INSTALL} -d ${SCALA_HOME}/bin
>+	@${MKDIR} ${SCALA_HOME}/bin
> .for f in ${SCALA_BINS}
>-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${SCALA_HOME}/bin/${f}
>-	${LN} -s ${SCALA_HOME}/bin/${f} ${PREFIX}/bin/${f}
>+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${SCALA_HOME}/bin/${f}
>+	@${LN} -s ${SCALA_HOME}/bin/${f} ${PREFIX}/bin/${f}
> .endfor
> .for d in ${SCALA_SHRDIRS}
> 	@cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} . ${SCALA_HOME}/${d}
> .endfor
> .for m in ${MAN1}
>-	${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${MANPREFIX}/man/man1/${m}
>+	@${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${MANPREFIX}/man/man1/${m}
>+.endfor
>+
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${DOCSDIR}
>+.for d in ${SCALA_DOCDIRS}
>+	@cd ${WRKSRC}/doc/${d} && ${COPYTREE_SHARE} . ${DOCSDIR}/${d}
> .endfor
>+.endif
> 
>-.if !defined(NOPORTDOCS)
>-	@${ECHO_MSG} ">> Installing documentation files..."
>-	@${INSTALL} -d ${DOCSDIR}
>-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
>-	@${ECHO_MSG} " [ DONE ]"
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+	@${MKDIR} ${EXAMPLESDIR}
>+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN scala.old/distinfo scala/distinfo
>--- scala.old/distinfo	2013-01-05 23:55:15.000000000 +0900
>+++ scala/distinfo	2013-01-06 00:01:17.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (scala-2.9.1.final.tgz) = 0bfc99143c63f5f1e3be71a1837b4c8e376e04d801bea4c887ce81661d9c5f13
>-SIZE (scala-2.9.1.final.tgz) = 24993458
>+SHA256 (scala-2.10.0.tgz) = a57bc12100671253d1ebc4a993e4da1896ff39022ce70c6699986d10644ac9a1
>+SIZE (scala-2.10.0.tgz) = 29856741
>diff -ruN scala.old/pkg-plist scala/pkg-plist
>--- scala.old/pkg-plist	2013-01-05 23:55:15.000000000 +0900
>+++ scala/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>@@ -1,159 +0,0 @@
>-%%PORTDOCS%%%%DOCSDIR%%/sbaz-setup/README.txt
>-%%PORTDOCS%%%%DOCSDIR%%/sbaz/manual.html
>-%%PORTDOCS%%%%DOCSDIR%%/sbaz/manual.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
>-bin/fsc
>-bin/sbaz
>-bin/sbaz-setup
>-bin/scala
>-bin/scalac
>-bin/scaladoc
>-bin/scalap
>-%%DATADIR%%/bin/fsc
>-%%DATADIR%%/bin/sbaz
>-%%DATADIR%%/bin/sbaz-setup
>-%%DATADIR%%/bin/scala
>-%%DATADIR%%/bin/scalac
>-%%DATADIR%%/bin/scaladoc
>-%%DATADIR%%/bin/scalap
>-%%DATADIR%%/lib/jline.jar
>-%%DATADIR%%/lib/scala-compiler.jar
>-%%DATADIR%%/lib/scala-dbc.jar
>-%%DATADIR%%/lib/scala-library.jar
>-%%DATADIR%%/lib/scala-swing.jar
>-%%DATADIR%%/lib/scalap.jar
>-%%DATADIR%%/meta/available
>-%%DATADIR%%/meta/description
>-%%DATADIR%%/meta/installed
>-%%DATADIR%%/meta/universe
>-%%DATADIR%%/misc/sbaz-testall/tests/sbaz
>-%%DATADIR%%/misc/sbaz/config/sbaz.properties.example
>-%%DATADIR%%/misc/sbaz/descriptors/README
>-%%DATADIR%%/misc/sbaz/descriptors/lamp-rc
>-%%DATADIR%%/misc/sbaz/descriptors/scala-dev
>-%%DATADIR%%/misc/sbaz/sbaz-tests.jar
>-%%DATADIR%%/misc/sbaz/scala-bazaars.jar
>-%%DATADIR%%/misc/scala-devel/plugins/continuations.jar
>-%%DATADIR%%/misc/scala-tool-support/a2ps/README
>-%%DATADIR%%/misc/scala-tool-support/a2ps/scala.ssh
>-%%DATADIR%%/misc/scala-tool-support/bash-completion/scala_completion.sh
>-%%DATADIR%%/misc/scala-tool-support/bluefish/README
>-%%DATADIR%%/misc/scala-tool-support/bluefish/highlighting
>-%%DATADIR%%/misc/scala-tool-support/emacs/AUTHORS
>-%%DATADIR%%/misc/scala-tool-support/emacs/FUTURE
>-%%DATADIR%%/misc/scala-tool-support/emacs/Makefile
>-%%DATADIR%%/misc/scala-tool-support/emacs/README
>-%%DATADIR%%/misc/scala-tool-support/emacs/contrib/README
>-%%DATADIR%%/misc/scala-tool-support/emacs/contrib/dot-ctags
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-auto.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-constants.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature-electric.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature-speedbar.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature-tags.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-feature.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-fontlock.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-indent.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-inf.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-lib.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-navigation.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-ui.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode-variables.el
>-%%DATADIR%%/misc/scala-tool-support/emacs/scala-mode.el
>-%%DATADIR%%/misc/scala-tool-support/enscript/README
>-%%DATADIR%%/misc/scala-tool-support/enscript/scala.st
>-%%DATADIR%%/misc/scala-tool-support/gedit/README
>-%%DATADIR%%/misc/scala-tool-support/gedit/scala.lang
>-%%DATADIR%%/misc/scala-tool-support/geshi/scala-alt.php
>-%%DATADIR%%/misc/scala-tool-support/geshi/scala.php
>-%%DATADIR%%/misc/scala-tool-support/intellij/README
>-%%DATADIR%%/misc/scala-tool-support/intellij/scala.xml
>-%%DATADIR%%/misc/scala-tool-support/jedit/console/README
>-%%DATADIR%%/misc/scala-tool-support/jedit/console/commando/scala.xml
>-%%DATADIR%%/misc/scala-tool-support/jedit/console/commando/scalac.xml
>-%%DATADIR%%/misc/scala-tool-support/jedit/modes/README
>-%%DATADIR%%/misc/scala-tool-support/jedit/modes/scala.xml
>-%%DATADIR%%/misc/scala-tool-support/kate/README
>-%%DATADIR%%/misc/scala-tool-support/kate/scala.xml
>-%%DATADIR%%/misc/scala-tool-support/latex/scaladefs.sty
>-%%DATADIR%%/misc/scala-tool-support/latex/scaladoc.sty
>-%%DATADIR%%/misc/scala-tool-support/latex/scalatex.scm
>-%%DATADIR%%/misc/scala-tool-support/latex/tweaklist.sty
>-%%DATADIR%%/misc/scala-tool-support/latex/verbfilterScala.java
>-%%DATADIR%%/misc/scala-tool-support/notepad-plus/README
>-%%DATADIR%%/misc/scala-tool-support/notepad-plus/userDefineLang.xml
>-%%DATADIR%%/misc/scala-tool-support/scite/README
>-%%DATADIR%%/misc/scala-tool-support/scite/scala.properties
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Documentation.webloc
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Info.plist
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/AutocompleteAdditions.txt
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/InfoPlist.strings
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj/Localizable.strings
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/ModeSettings.xml
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/RegexSymbols.xml
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts/Rot13.scpt
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/SyntaxDefinition.xml
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/mytemplate.scala
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/artwork/SymbolM.psd
>-%%DATADIR%%/misc/scala-tool-support/subethaedit/artwork/readme.txt
>-%%DATADIR%%/misc/scala-tool-support/textmate/Bundles/Scala.tmbundle.zip
>-%%DATADIR%%/misc/scala-tool-support/textwrangler/README
>-%%DATADIR%%/misc/scala-tool-support/textwrangler/Scala_Configuration.plist
>-%%DATADIR%%/misc/scala-tool-support/vim/README
>-%%DATADIR%%/misc/scala-tool-support/vim/ftdetect/scala.vim
>-%%DATADIR%%/misc/scala-tool-support/vim/indent/scala.vim
>-%%DATADIR%%/misc/scala-tool-support/vim/plugin/31-create-scala.vim
>-%%DATADIR%%/misc/scala-tool-support/vim/syntax/scala.vim
>-%%DATADIR%%/misc/scala-tool-support/xcode/README
>-%%DATADIR%%/misc/scala-tool-support/xcode/Specifications/Scala.pbfilespec
>-%%DATADIR%%/misc/scala-tool-support/xcode/Specifications/Scala.pblangspec
>-@dirrm %%DATADIR%%/misc/scala-tool-support/xcode/Specifications
>-@dirrm %%DATADIR%%/misc/scala-tool-support/xcode
>-@dirrm %%DATADIR%%/misc/scala-tool-support/vim/syntax
>-@dirrm %%DATADIR%%/misc/scala-tool-support/vim/plugin
>-@dirrm %%DATADIR%%/misc/scala-tool-support/vim/indent
>-@dirrm %%DATADIR%%/misc/scala-tool-support/vim/ftdetect
>-@dirrm %%DATADIR%%/misc/scala-tool-support/vim
>-@dirrm %%DATADIR%%/misc/scala-tool-support/textwrangler
>-@dirrm %%DATADIR%%/misc/scala-tool-support/textmate/Bundles
>-@dirrm %%DATADIR%%/misc/scala-tool-support/textmate
>-@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/artwork
>-@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/Scripts
>-@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources/English.lproj
>-@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents/Resources
>-@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode/Contents
>-@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit/Scala.mode
>-@dirrm %%DATADIR%%/misc/scala-tool-support/subethaedit
>-@dirrm %%DATADIR%%/misc/scala-tool-support/scite
>-@dirrm %%DATADIR%%/misc/scala-tool-support/notepad-plus
>-@dirrm %%DATADIR%%/misc/scala-tool-support/latex
>-@dirrm %%DATADIR%%/misc/scala-tool-support/kate
>-@dirrm %%DATADIR%%/misc/scala-tool-support/jedit/modes
>-@dirrm %%DATADIR%%/misc/scala-tool-support/jedit/console/commando
>-@dirrm %%DATADIR%%/misc/scala-tool-support/jedit/console
>-@dirrm %%DATADIR%%/misc/scala-tool-support/jedit
>-@dirrm %%DATADIR%%/misc/scala-tool-support/intellij
>-@dirrm %%DATADIR%%/misc/scala-tool-support/geshi
>-@dirrm %%DATADIR%%/misc/scala-tool-support/gedit
>-@dirrm %%DATADIR%%/misc/scala-tool-support/enscript
>-@dirrm %%DATADIR%%/misc/scala-tool-support/emacs/contrib
>-@dirrm %%DATADIR%%/misc/scala-tool-support/emacs
>-@dirrm %%DATADIR%%/misc/scala-tool-support/bluefish
>-@dirrm %%DATADIR%%/misc/scala-tool-support/bash-completion
>-@dirrm %%DATADIR%%/misc/scala-tool-support/a2ps
>-@dirrm %%DATADIR%%/misc/scala-tool-support
>-@dirrm %%DATADIR%%/misc/scala-devel/plugins
>-@dirrm %%DATADIR%%/misc/scala-devel
>-@dirrm %%DATADIR%%/misc/sbaz/descriptors
>-@dirrm %%DATADIR%%/misc/sbaz/config
>-@dirrm %%DATADIR%%/misc/sbaz-testall/tests
>-@dirrm %%DATADIR%%/misc/sbaz-testall
>-@dirrm %%DATADIR%%/misc/sbaz
>-@dirrm %%DATADIR%%/misc
>-@dirrm %%DATADIR%%/meta
>-@dirrm %%DATADIR%%/lib
>-@dirrm %%DATADIR%%/bin
>-@dirrmtry %%DATADIR%%
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sbaz-setup
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sbaz
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 175342: 131292