aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/apache-ant/Makefile2
-rw-r--r--devel/cdk/Makefile3
-rw-r--r--devel/cscout/Makefile5
-rw-r--r--devel/cvsmonitor/Makefile3
-rw-r--r--devel/gdb66/Makefile5
-rw-r--r--devel/git/Makefile7
-rw-r--r--devel/hadoop/Makefile5
-rw-r--r--devel/hive/Makefile3
-rw-r--r--devel/jakarta-commons-configuration/Makefile3
-rw-r--r--devel/jakarta-commons-daemon/Makefile5
-rw-r--r--devel/jakarta-commons-io/Makefile3
-rw-r--r--devel/jakarta-commons-jxpath/Makefile3
-rw-r--r--devel/jakarta-commons-modeler/Makefile3
-rw-r--r--devel/jgoodies-common/Makefile3
-rw-r--r--devel/libassa/Makefile7
-rw-r--r--devel/looks/Makefile4
-rw-r--r--devel/oozie/Makefile7
-rw-r--r--devel/openzz/Makefile3
-rw-r--r--devel/p5-App-GitGot/Makefile2
-rw-r--r--devel/p5-Class-C3-Componentised/Makefile2
-rw-r--r--devel/p5-DateTime-Set/Makefile2
-rw-r--r--devel/pig/Makefile7
-rw-r--r--devel/py-json-py/Makefile5
-rw-r--r--devel/ruby-aspectr/Makefile3
-rw-r--r--devel/ruby-rbbr/Makefile1
-rw-r--r--devel/ruby-tzfile/Makefile2
-rw-r--r--devel/sigslot/Makefile3
-rw-r--r--devel/spark/Makefile3
-rw-r--r--devel/swank-clojure/Makefile7
-rw-r--r--devel/swank-clojure/distinfo4
-rw-r--r--devel/tinylaf/Makefile3
-rw-r--r--devel/vera++/Makefile4
-rw-r--r--devel/xdg-utils/Makefile1
33 files changed, 49 insertions, 74 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index adb1963a8452..bddf50991a7c 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -4,7 +4,7 @@
PORTNAME= apache-ant
PORTVERSION= 1.9.4
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
+MASTER_SITES= APACHE/ant/binaries/:bin \
LOCAL/hq:man
DISTFILES= ${ANT_DISTFILE}:bin \
${MANPAGE_DISTFILE}:man
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 59914b4cb8d5..9afb2ad8036d 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= cdk
-PORTVERSION= 5.0.20120323
+DISTVERSION= 5.0-20120323
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/cdk/
-DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Curses Development Kit for speedy development of full screen programs
diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index 129009eba8fd..a396a5703332 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -7,15 +7,14 @@ PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.spinellis.gr/cscout/ \
http://www.dmst.aueb.gr/dds/cscout/
-DISTFILES= ${PORTNAME}-${PORTVERSION}-neutral${EXTRACT_SUFX} \
- ${PORTNAME}-${PORTVERSION}-fbsd-${ARCH}${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}-neutral${EXTRACT_SUFX} \
+ ${DISTNAME}-fbsd-${ARCH}${EXTRACT_SUFX}
MAINTAINER= dds@FreeBSD.org
COMMENT= Source code analyzer and refactoring browser for C program collections
LIB_DEPENDS+= libc.so.6:${PORTSDIR}/misc/compat6x
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
NO_BUILD= yes
ONLY_FOR_ARCHS= i386 amd64 sparc64
ONLY_FOR_ARCHS_REASON= The port fetches and installs precompiled binaries
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index 459fb6f07df5..e1d8e4900fdb 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= cvsmonitor
-PORTVERSION= 0.6.3
+DISTVERSION= 0-6-3
PORTREVISION= 7
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Stable
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
MAINTAINER= ports@FreeBSD.org
COMMENT= Monitor activity on a CVS Repository
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 2325083d13ae..4a1c42cd9fff 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -5,10 +5,9 @@ PORTNAME= gdb
PORTVERSION= 6.6
PORTREVISION?= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU:S,$,:gdb,} \
+MASTER_SITES= GNU/gdb/ \
http://aldan.algebra.com/~mi/:gdbtk
-MASTER_SITE_SUBDIR=gdb/:gdb
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:gdb
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= mi@aldan.algebra.com
COMMENT?= GNU GDB of newer version than comes with the system
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 8e594f02d11a..664b531972e3 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -4,12 +4,11 @@
PORTNAME= git
PORTVERSION= 2.4.0
CATEGORIES= devel
-MASTER_SITES= KERNEL_ORG
-MASTER_SITE_SUBDIR= software/scm/git
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+MASTER_SITES= KERNEL_ORG/software/scm/git
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
# We manually extract the htmldocs.
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= garga@FreeBSD.org
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index b3851e92f8d3..80c9d69f8836 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -5,10 +5,9 @@ PORTNAME= hadoop
PORTVERSION= 1.2.1
PORTREVISION= 3
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE} \
+MASTER_SITES= APACHE/${PORTNAME}/core/${PORTNAME}-${PORTVERSION} \
http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
-MASTER_SITE_SUBDIR= ${PORTNAME}/core/${PORTNAME}-${PORTVERSION}
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} jetty-6.1.14.zip:jetty
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jetty-6.1.14.zip:jetty
DIST_SUBDIR= hadoop
MAINTAINER= demon@FreeBSD.org
diff --git a/devel/hive/Makefile b/devel/hive/Makefile
index 1878c1061713..e8300bba5cc2 100644
--- a/devel/hive/Makefile
+++ b/devel/hive/Makefile
@@ -4,10 +4,9 @@
PORTNAME= hive
PORTVERSION= 1.1.0
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE} \
+MASTER_SITES= APACHE/${PORTNAME}/stable \
LOCAL/demon/:maven \
http://people.freebsd.org/~demon/:maven
-MASTER_SITE_SUBDIR=${PORTNAME}/stable
DISTFILES= apache-${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
DIST_SUBDIR= hadoop
diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile
index bcbe147a2f54..028270d17bd3 100644
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/jakarta-commons-configuration/Makefile
@@ -4,8 +4,7 @@
PORTNAME= commons-configuration
PORTVERSION= 1.10
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
+MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile
index cfdf1ff7b26a..075b95baab1d 100644
--- a/devel/jakarta-commons-daemon/Makefile
+++ b/devel/jakarta-commons-daemon/Makefile
@@ -4,9 +4,8 @@
PORTNAME= commons-daemon
PORTVERSION= 1.0.15
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE:S,$,:src,} \
- ${MASTER_SITE_APACHE_COMMONS_BINARIES:S,$,:bin,}
-MASTER_SITE_SUBDIR= daemon/:src daemon/:bin
+MASTER_SITES= APACHE_COMMONS_SOURCE:src \
+ APACHE_COMMONS_BINARIES:bin
PKGNAMEPREFIX= jakarta-
DISTFILES= ${PORTNAME}-${PORTVERSION}-native-src${EXTRACT_SUFX}:src \
${PORTNAME}-${PORTVERSION}-bin${EXTRACT_SUFX}:bin
diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile
index 72d1181d6458..3e1bbdddc26f 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/jakarta-commons-io/Makefile
@@ -4,8 +4,7 @@
PORTNAME= commons-io
PORTVERSION= 2.4
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
+MASTER_SITES= APACHE_COMMONS_SOURCE
PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/devel/jakarta-commons-jxpath/Makefile b/devel/jakarta-commons-jxpath/Makefile
index 1602d22b3c2b..35f0330695e0 100644
--- a/devel/jakarta-commons-jxpath/Makefile
+++ b/devel/jakarta-commons-jxpath/Makefile
@@ -4,8 +4,7 @@
PORTNAME= commons-jxpath
PORTVERSION= 1.3
CATEGORIES= devel www java
-MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
+MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
diff --git a/devel/jakarta-commons-modeler/Makefile b/devel/jakarta-commons-modeler/Makefile
index 24834ac51ec3..418ea0f8b82f 100644
--- a/devel/jakarta-commons-modeler/Makefile
+++ b/devel/jakarta-commons-modeler/Makefile
@@ -5,8 +5,7 @@ PORTNAME= commons-modeler
PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
+MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= jakarta-
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/jgoodies-common/Makefile b/devel/jgoodies-common/Makefile
index f126f2464543..c41dc6d6809b 100644
--- a/devel/jgoodies-common/Makefile
+++ b/devel/jgoodies-common/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= jgoodies-common
-PORTVERSION= 1.2.1
+DISTVERSION= 1_2_1
CATEGORIES= devel java
MASTER_SITES= http://www.jgoodies.com/download/libraries/common/
-DISTNAME= ${PORTNAME}-${PORTVERSION:S|.|_|g}
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract and helper classes used by all other JGoodies libs
diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index 8bd060632f74..be2f96c83f49 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= libassa
-PORTVERSION= 3.4.2.2
+DISTVERSION= 3.4.2-2
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.4.2
-DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.([[:digit:]])$/-\1/}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION:C/-.*$//}
MAINTAINER= rodrigo@FreeBSD.org
COMMENT= C++ networking library and application framework
@@ -16,7 +15,7 @@ USES= libtool pathfix pkgconfig
USE_LDCONFIG= yes
PLIST_SUB= ASSA_VERSION=${PORTVERSION:R:R}
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/(\.[[:digit:]])$//}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*$//}
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS/s: doc : :g' ${WRKSRC}/Makefile.in
diff --git a/devel/looks/Makefile b/devel/looks/Makefile
index eeb8b6838026..f4eba6db7e48 100644
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= looks
-PORTVERSION= 2.5.2
+DISTVERSION= 2_5_2
PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= http://www.jgoodies.com/download/libraries/${PORTNAME}/
-DISTNAME= jgoodies-${PORTNAME}-${PORTVERSION:S|.|_|g}
+DISTNAME= jgoodies-${PORTNAME}-${DISTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= JGoodies Looks improve the appearance of your Java applications
diff --git a/devel/oozie/Makefile b/devel/oozie/Makefile
index 75d56beea842..a9c3070e463a 100644
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@@ -4,15 +4,14 @@
PORTNAME= oozie
PORTVERSION= 4.1.0
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE} \
+MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION} \
LOCAL/demon/:maven \
http://archive.apache.org/dist/tomcat/tomcat-6/v${TOMCAT_VERSION}/bin/:tomcat \
http://extjs.com/deploy/:libext \
http://central.maven.org/maven2/org/apache/hadoop/hadoop-client/${HADOOP_VERSION}/:hadoopclient
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat ext-2.2.zip:libext hadoop-client-${HADOOP_VERSION}.jar:hadoopclient
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat ext-2.2.zip:libext hadoop-client-${HADOOP_VERSION}.jar:hadoopclient
DIST_SUBDIR= hadoop
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz
MAINTAINER= demon@FreeBSD.org
COMMENT= Workflow scheduler for Hadoop
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index b816440a689e..e2c71d940129 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= openzz
-PORTVERSION= 1.0.4.4
+DISTVERSION= 1.0.4-4
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0.4-4
-DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Interpreted dynamic parser
diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile
index eda0c7904acd..001f18ddf238 100644
--- a/devel/p5-App-GitGot/Makefile
+++ b/devel/p5-App-GitGot/Makefile
@@ -3,11 +3,11 @@
PORTNAME= App-GitGot
PORTVERSION= 1.33
+DISTVERSIONSUFFIX= 0
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:GENEHACK
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-${PORTVERSION}0
MAINTAINER= perl@FreeBSD.org
COMMENT= Tool to make it easier to manage multiple git repositories
diff --git a/devel/p5-Class-C3-Componentised/Makefile b/devel/p5-Class-C3-Componentised/Makefile
index 74b64eb71f39..4e58a9b00ca5 100644
--- a/devel/p5-Class-C3-Componentised/Makefile
+++ b/devel/p5-Class-C3-Componentised/Makefile
@@ -3,11 +3,11 @@
PORTNAME= Class-C3-Componentised
PORTVERSION= 1.0010
+DISTVERSIONSUFFIX= 00
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-${PORTVERSION}00
MAINTAINER= perl@FreeBSD.org
COMMENT= Load mix-ins or components to your C3-based class
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index cc88c65f8965..d67534b98770 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -3,11 +3,11 @@
PORTNAME= DateTime-Set
PORTVERSION= 0.34
+DISTVERSIONSUFFIX= 00
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-DISTNAME= ${PORTNAME}-${PORTVERSION}00
MAINTAINER= perl@FreeBSD.org
COMMENT= Datetime sets and set math
diff --git a/devel/pig/Makefile b/devel/pig/Makefile
index 3225ed2c7351..a8fc3d4dbc21 100644
--- a/devel/pig/Makefile
+++ b/devel/pig/Makefile
@@ -4,14 +4,13 @@
PORTNAME= pig
PORTVERSION= 0.14.0
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE} \
+MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
LOCAL/demon/:ant \
http://people.freebsd.org/~demon/:ant \
http://central.maven.org/maven2/org/apache/ivy/ivy/2.2.0/:ivy
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz:ant ivy-2.2.0.jar:ivy
+DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz:ant ivy-2.2.0.jar:ivy
DIST_SUBDIR= hadoop
-EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz
+EXTRACT_ONLY= ${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-ant-repository.tar.gz
MAINTAINER= demon@FreeBSD.org
COMMENT= Engine for executing data flows in parallel on Hadoop
diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile
index 5ea58db43d4e..03bb1af7e7a7 100644
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= json-py
-PORTVERSION= 3.4
+DISTVERSION= 3_4
PORTREVISION= 1
CATEGORIES= devel lang www python
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3_4
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python implementation of a JSON (http//:json.org) reader/writer
diff --git a/devel/ruby-aspectr/Makefile b/devel/ruby-aspectr/Makefile
index d20a5e3db388..0221247b0a1a 100644
--- a/devel/ruby-aspectr/Makefile
+++ b/devel/ruby-aspectr/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= aspectr
-PORTVERSION= 0.3.5
+DISTVERSION= 0-3-5
CATEGORIES= devel ruby
MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
DIST_SUBDIR= ruby
MAINTAINER= ruby@FreeBSD.org
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index d6908259088a..eb57234c7a62 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 11
CATEGORIES= devel ruby
MASTER_SITES= SF/ruby-gnome2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/r/rev/}
DIST_SUBDIR= ruby
MAINTAINER= ruby@FreeBSD.org
diff --git a/devel/ruby-tzfile/Makefile b/devel/ruby-tzfile/Makefile
index 36e0312cb852..5433c3915ac7 100644
--- a/devel/ruby-tzfile/Makefile
+++ b/devel/ruby-tzfile/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tzfile
PORTVERSION= 0.1
CATEGORIES= devel ruby
MASTER_SITES= http://www.a-k-r.org/ruby-tzfile/
-DISTFILES= ruby-${PORTNAME}-${PORTVERSION}.tar.gz
+DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
MAINTAINER= ruby@FreeBSD.org
COMMENT= TZFile handling library for Ruby
diff --git a/devel/sigslot/Makefile b/devel/sigslot/Makefile
index 4a91e04591ea..f7a59cf334ea 100644
--- a/devel/sigslot/Makefile
+++ b/devel/sigslot/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= sigslot
-PORTVERSION= 1.0.0
+DISTVERSION= 1-0-0
CATEGORIES= devel
MASTER_SITES= SF
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ Signal/Slot Library
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index fdeffab379d7..c1e31ecddaf4 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -4,10 +4,9 @@
PORTNAME= spark
PORTVERSION= 1.2.1
CATEGORIES= devel java
-MASTER_SITES= ${MASTER_SITE_APACHE} \
+MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
LOCAL/demon/:maven \
http://people.freebsd.org/~demon/:maven
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= apache-
DISTFILES= ${PORTNAME}-${PORTVERSION}.tgz FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
DIST_SUBDIR= hadoop
diff --git a/devel/swank-clojure/Makefile b/devel/swank-clojure/Makefile
index d8e3b3e7d231..1e7a6a0fd7f6 100644
--- a/devel/swank-clojure/Makefile
+++ b/devel/swank-clojure/Makefile
@@ -3,14 +3,13 @@
PORTNAME= swank-clojure
PORTVERSION= 1.2.1
CATEGORIES= devel lisp java
-MASTER_SITES= http://download.github.com/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=olgeni
-DISTNAME= technomancy-${PORTNAME}-${PORTVERSION}-0-g0af258a
+MASTER_SITES= LOCAL/olgeni
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Swank/SLIME support for Clojure
+USE_GITHUB= yes
+GH_ACCOUNT= technomancy
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/devel/swank-clojure/distinfo b/devel/swank-clojure/distinfo
index 88082d7a67a6..2ca9d1e7acbe 100644
--- a/devel/swank-clojure/distinfo
+++ b/devel/swank-clojure/distinfo
@@ -1,2 +1,2 @@
-SHA256 (technomancy-swank-clojure-1.2.1-0-g0af258a.tar.gz) = efceeaa9f6b2ab4d04ac6e351826975b0ea63b08781b65bd5488a0af82cece75
-SIZE (technomancy-swank-clojure-1.2.1-0-g0af258a.tar.gz) = 45111
+SHA256 (technomancy-swank-clojure-1.2.1_GH0.tar.gz) = 1bc84eea7ad2587cdb3dff241f3e2646dff53c22c24f39b7902779d86c26725f
+SIZE (technomancy-swank-clojure-1.2.1_GH0.tar.gz) = 45107
diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile
index 161de7ed8505..f36c350f8d6d 100644
--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= tinylaf
-PORTVERSION= 1.4.0
+DISTVERSION= 1_4_0
CATEGORIES= devel java
MASTER_SITES= http://www.muntjak.de/hans/java/tinylaf/
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}
MAINTAINER= ayu@commun.jp
COMMENT= Pluggable Look and Feel for Java
diff --git a/devel/vera++/Makefile b/devel/vera++/Makefile
index a0bdb4676f53..4ff3b2e4d635 100644
--- a/devel/vera++/Makefile
+++ b/devel/vera++/Makefile
@@ -5,8 +5,8 @@ PORTNAME= vera++
PORTVERSION= 1.3.0
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/verateam/vera/downloads/
-DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
- ${PORTNAME}-${PORTVERSION}-doc.tar.gz
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ ${DISTNAME}-doc${EXTRACT_SUFX}
MAINTAINER= cristianorolim@outlook.com
COMMENT= Tool for verification of C++ source code
diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
index 788b5347098b..7306f2a50ce1 100644
--- a/devel/xdg-utils/Makefile
+++ b/devel/xdg-utils/Makefile
@@ -8,7 +8,6 @@ PORTREVISION= 1
CATEGORIES= devel
#MASTER_SITES= http://portland.freedesktop.org/download/
MASTER_SITES= LOCAL/kwm
-DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tools to allow all applications to integrate with the free desktop