Date: Mon, 11 May 2015 18:34:58 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386097 - in head: archivers/deco archivers/linux-f10-upx archivers/upx audio/guspat audio/libaacplus audio/mp3c biology/protomol cad/alliance cad/electric cad/gnucap cad/tochnog chines... Message-ID: <201505111834.t4BIYwFQ010636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 11 18:34:57 2015 New Revision: 386097 URL: https://svnweb.freebsd.org/changeset/ports/386097 Log: Cleanup DIST* variables. When appropriate: - Try to use DISTVERSION{SUF,PRE}FIX - Replace PORTNAME-PORTVERSION by DISTNAME - Convert MASTER_SITES to use macros - Other light cleanup With hat: portmgr Sponsored by: Absolight Modified: head/archivers/deco/Makefile head/archivers/linux-f10-upx/Makefile head/archivers/upx/Makefile head/audio/guspat/Makefile head/audio/libaacplus/Makefile head/audio/mp3c/Makefile head/biology/protomol/Makefile head/cad/alliance/Makefile head/cad/electric/Makefile head/cad/gnucap/Makefile head/cad/tochnog/Makefile head/chinese/cce/Makefile head/chinese/fqterm/Makefile head/chinese/ibus-chewing/Makefile head/chinese/ibus-chewing/distinfo head/chinese/reciteword/Makefile head/comms/lirc/Makefile head/comms/ncid/Makefile head/converters/pdf2djvu/Makefile head/databases/flamerobin/Makefile head/databases/hbase/Makefile head/databases/jakarta-commons-dbutils/Makefile head/databases/java-mybatis/Makefile head/databases/mysql-connector-c/Makefile head/databases/mysql-connector-odbc/Makefile head/databases/ocaml-dbm/Makefile head/databases/pear-DB/Makefile head/databases/pyspatialite/Makefile head/deskutils/ganttproject/Makefile head/deskutils/treesheets/Makefile head/deskutils/treesheets/distinfo head/devel/apache-ant/Makefile head/devel/cdk/Makefile head/devel/cscout/Makefile head/devel/cvsmonitor/Makefile head/devel/gdb66/Makefile head/devel/git/Makefile head/devel/hadoop/Makefile head/devel/hive/Makefile head/devel/jakarta-commons-configuration/Makefile head/devel/jakarta-commons-daemon/Makefile head/devel/jakarta-commons-io/Makefile head/devel/jakarta-commons-jxpath/Makefile head/devel/jakarta-commons-modeler/Makefile head/devel/jgoodies-common/Makefile head/devel/libassa/Makefile head/devel/looks/Makefile head/devel/oozie/Makefile head/devel/openzz/Makefile head/devel/p5-App-GitGot/Makefile head/devel/p5-Class-C3-Componentised/Makefile head/devel/p5-DateTime-Set/Makefile head/devel/pig/Makefile head/devel/py-json-py/Makefile head/devel/ruby-aspectr/Makefile head/devel/ruby-rbbr/Makefile head/devel/ruby-tzfile/Makefile head/devel/sigslot/Makefile head/devel/spark/Makefile head/devel/swank-clojure/Makefile head/devel/swank-clojure/distinfo head/devel/tinylaf/Makefile head/devel/vera++/Makefile head/devel/xdg-utils/Makefile head/dns/nslint/Makefile head/dns/radns/Makefile head/editors/emacs-devel/Makefile head/editors/fte/Makefile head/editors/gnotepad+/Makefile head/editors/jed/Makefile head/editors/lazarus/Makefile head/editors/texworks/Makefile head/emulators/kqemu-kmod-devel/Makefile head/emulators/kqemu-kmod/Makefile head/emulators/minivmac/Makefile head/emulators/q4wine/Makefile head/emulators/ucon64/Makefile head/ftp/wmget/Makefile head/games/blockade/Makefile head/games/fillets-ng/Makefile head/games/gnuchess/Makefile head/games/heroes/Makefile head/games/linux-enemyterritory-etpro/Makefile head/games/nimuh/Makefile head/games/pydance/Makefile head/games/tuxracer/Makefile head/games/unnethack/Makefile head/games/uqm/Makefile head/games/viruskiller/Makefile head/games/wmtictactoe/Makefile head/games/xmine/Makefile head/games/zangband/Makefile head/graphics/aalib/Makefile head/graphics/aview/Makefile head/graphics/cbrpager/Makefile head/graphics/cbviewer/Makefile head/graphics/pencil/Makefile head/graphics/phplot/Makefile head/graphics/ppsei/Makefile head/graphics/py-goocanvas/Makefile head/graphics/ruby-svg/Makefile head/graphics/truevision/Makefile head/japanese/ajaxzip2-core/Makefile head/japanese/gskk/Makefile head/japanese/jd/Makefile head/japanese/kcode/Makefile head/japanese/mailman/Makefile head/japanese/man/Makefile head/japanese/nethack34/Makefile head/java/jaf/Makefile head/java/jai/Makefile head/java/jakarta-commons-beanutils/Makefile head/java/jakarta-commons-cli/Makefile head/java/jakarta-commons-codec/Makefile head/java/jakarta-commons-collections/Makefile head/java/jakarta-commons-dbcp/Makefile head/java/jakarta-commons-discovery/Makefile head/java/jakarta-commons-lang/Makefile head/java/jakarta-commons-logging/Makefile head/java/jakarta-commons-pool/Makefile head/java/jakarta-commons-primitives/Makefile head/java/jakarta-struts/Makefile head/java/jflex/Makefile head/java/jrosetta/Makefile head/java/junit/Makefile head/lang/bsh/Makefile head/lang/f2c/Makefile head/lang/jakarta-commons-jelly/Makefile head/lang/mit-scheme/Makefile head/lang/nbc/Makefile head/lang/p5-Marpa-PP/Makefile head/lang/p5-Marpa/Makefile head/lang/phantomjs/Makefile head/lang/sather-specification/Makefile head/lang/sather-tutorial/Makefile head/lang/x10/Makefile head/mail/ecartis/Makefile head/mail/junkfilter/Makefile head/mail/mime4j/Makefile head/mail/mulberry/Makefile head/mail/p5-Email-Delete/Makefile head/mail/p5-Email-MIME-ContentType/Makefile head/mail/postfinger/Makefile head/mail/qsheff/Makefile head/mail/rainloop/Makefile head/mail/sa-stats/Makefile head/mail/simscan/Makefile head/mail/squirrelmail/Makefile head/math/asymptote/Makefile head/math/ipopt/Makefile head/math/jakarta-commons-math/Makefile head/math/jakarta-commons-math3/Makefile head/math/p5-Math-BaseCnv/Makefile head/math/topaz/Makefile head/math/triangle/Makefile head/math/wingz3/Makefile head/misc/bb/Makefile head/misc/exercism/Makefile head/misc/exercism/distinfo head/misc/explosions/Makefile head/misc/p5-Geo-Coder-Many/Makefile head/multimedia/dvd-slideshow/Makefile head/multimedia/linux-xmovie/Makefile head/multimedia/ptx-kmod/Makefile head/net-im/ejabberd/Makefile head/net-im/p5-Net-XMPP/Makefile head/net-im/tkabbur/Makefile head/net-im/xmpp-client/Makefile head/net-mgmt/arpwatch/Makefile head/net-mgmt/ezradius/Makefile head/net-mgmt/netwag/Makefile head/net-mgmt/netwox/Makefile head/net-mgmt/rackmonkey/Makefile head/net-p2p/cpuminer/Makefile head/net/activemq/Makefile head/net/belle-sip/Makefile head/net/jakarta-commons-net/Makefile head/net/jrdesktop/Makefile head/net/mgen/Makefile head/net/netwib/Makefile head/net/openospfd/Makefile head/net/p5-Net-SPDY/Makefile head/net/proxy-connect/Makefile head/net/py-libcloud/Makefile head/net/ss5/Makefile head/net/unison-devel/Makefile head/net/unison/Makefile head/net/unison232/Makefile head/net/unison240/Makefile head/net/wmwave/Makefile head/palm/palm-db-tools/Makefile head/polish/kadu/Makefile head/polish/qnapi/Makefile head/ports-mgmt/dialog4ports/Makefile head/ports-mgmt/fastest_sites/Makefile head/print/foomatic-db-engine/Makefile head/print/foomatic-db-hpijs/Makefile head/print/py-reportlab/Makefile head/print/rtf2latex2e/Makefile head/print/xtexsh/Makefile head/science/cdf/Makefile head/science/liblinear/Makefile head/science/libsvm/Makefile head/security/pear-Crypt_Blowfish/Makefile head/security/retranslator/Makefile head/security/secpanel/Makefile head/security/steghide/Makefile head/shells/bash/Makefile head/sysutils/deltup/Makefile head/sysutils/fcron/Makefile head/sysutils/fpkg/Makefile head/sysutils/freesbie/Makefile head/sysutils/fusefs-sqlfs/Makefile head/sysutils/graveman/Makefile head/sysutils/hourglass/Makefile head/sysutils/jdiskreport/Makefile head/sysutils/osquery/Makefile head/sysutils/osquery/distinfo head/sysutils/progsreiserfs/Makefile head/sysutils/qzeitgeist/Makefile head/sysutils/serf/Makefile head/sysutils/serf/distinfo head/sysutils/testdisk/Makefile head/sysutils/userneu-devel/Makefile head/sysutils/userneu/Makefile head/sysutils/xen-tools/Makefile head/textproc/dixit/Makefile head/textproc/fop/Makefile head/textproc/htmldoc/Makefile head/textproc/jakarta-commons-digester/Makefile head/textproc/jdictionary/Makefile head/textproc/kmfl-khmer/Makefile head/textproc/kmfl-khmer/distinfo head/textproc/kmflcomp/Makefile head/textproc/libtranslate/Makefile head/textproc/multimarkdown/Makefile head/textproc/multimarkdown/distinfo head/textproc/p5-Algorithm-RabinKarp/Makefile head/textproc/p5-Hash-Merge/Makefile head/textproc/p5-Marpa-HTML/Makefile head/textproc/refdb/Makefile head/textproc/resume/Makefile head/textproc/vbindiff/Makefile head/textproc/wordnet/Makefile head/textproc/xmlto/Makefile head/www/apache-forrest/Makefile head/www/axis2/Makefile head/www/b2evolution/Makefile head/www/boa/Makefile head/www/htmlcompressor/Makefile head/www/linux-c6-qt47-webkit/Makefile head/www/madsonic/Makefile head/www/mohawk/Makefile head/www/p5-Apache-Clean2/Makefile head/www/p5-CGI-Ajax/Makefile head/www/p5-Catalyst-Model-Tarantool/Makefile head/www/p5-URI-ParseSearchString/Makefile head/www/py-albatross/Makefile head/www/py-django-crispy-forms/Makefile head/www/py-django-signals-ahoy/Makefile head/www/py-html5lib/Makefile head/www/tomcat-native/Makefile head/www/tomcat6/Makefile head/www/tomcat7/Makefile head/www/tomcat8/Makefile head/www/trac-wikinotification/Makefile head/www/wikicalc/Makefile head/www/woof/Makefile head/www/yuicompressor/Makefile head/www/zend-framework1/Makefile head/x11-clocks/asclock-gtk/Makefile head/x11-fm/doublecmd/Makefile head/x11-fm/mucommander/Makefile head/x11-fonts/bitstream-vera/Makefile head/x11-fonts/code2000/Makefile head/x11-fonts/junicode/Makefile head/x11-fonts/padauk/Makefile head/x11-themes/gtk-equinox-engine/Makefile head/x11-themes/kde-icons-lush/Makefile head/x11-toolkits/linux-c6-gtk2/Makefile head/x11-toolkits/linux-f10-gtk2/Makefile head/x11-toolkits/v/Makefile head/x11-wm/fluxbox/Makefile head/x11/imwheel/Makefile head/x11/leechcraft/Makefile Modified: head/archivers/deco/Makefile ============================================================================== --- head/archivers/deco/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/archivers/deco/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,10 +4,10 @@ PORTNAME= deco PORTVERSION= 1.6.3 PORTREVISION= 1 CATEGORIES= archivers -MASTER_SITES= http://hartlich.com/deco/download/:site1 \ +MASTER_SITES= http://hartlich.com/deco/download/ \ http://hartlich.com/deco/archive/download/:site2 -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:site1 \ - ${PORTNAME}-archive-1.6.tar.gz:site2 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}-archive-1.6${EXTRACT_SUFX}:site2 MAINTAINER= kevlo@FreeBSD.org COMMENT= Program to extract various archive file formats Modified: head/archivers/linux-f10-upx/Makefile ============================================================================== --- head/archivers/linux-f10-upx/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/archivers/linux-f10-upx/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -6,7 +6,6 @@ PORTVERSION= 3.03 CATEGORIES= archivers linux MASTER_SITES= LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} PKGNAMEPREFIX= linux-f10- -DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} MAINTAINER= emulation@FreeBSD.org COMMENT= UPX, a high-performance executable packer (Linux Fedora 10) Modified: head/archivers/upx/Makefile ============================================================================== --- head/archivers/upx/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/archivers/upx/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -6,7 +6,7 @@ PORTVERSION= 3.91 CATEGORIES= archivers MASTER_SITES= http://upx.sourceforge.net/download/\ SF/sevenzip/7-Zip/${LZMA_VER}:lzma -DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}\ +DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \ 7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma MAINTAINER= fjoe@FreeBSD.org Modified: head/audio/guspat/Makefile ============================================================================== --- head/audio/guspat/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/audio/guspat/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -7,8 +7,8 @@ PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ftp://plamo.linet.gr.jp/pub/Plamo-src/contrib/Sound/timidity/ \ LOCAL/nork -DISTFILES= ${PORTNAME}-${PORTVERSION}-required${EXTRACT_SUFX} \ - ${PORTNAME}-${PORTVERSION}-optional${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}-required${EXTRACT_SUFX} \ + ${DISTNAME}-optional${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Izumo collection of Gravis Ultrasound MIDI patches Modified: head/audio/libaacplus/Makefile ============================================================================== --- head/audio/libaacplus/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/audio/libaacplus/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,10 +5,10 @@ PORTNAME= libaacplus PORTVERSION= 2.0.2 PORTREVISION= 7 CATEGORIES= audio -MASTER_SITES= http://tipok.org.ua/downloads/media/aacplus/libaacplus/:site1\ - ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2\ +MASTER_SITES= http://tipok.org.ua/downloads/media/aacplus/libaacplus/ \ + ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2 \ http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/:site2 -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:site1\ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SRC26410}:site2 MAINTAINER= takefu@airport.fm Modified: head/audio/mp3c/Makefile ============================================================================== --- head/audio/mp3c/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/audio/mp3c/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -6,9 +6,9 @@ PORTVERSION= 0.31 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ftp://ftp.wspse.de/linux/wspse/:src -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \ cdrip.sh -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= joris@vandalon.nl COMMENT= CD to mp3c converter with a console frontend Modified: head/biology/protomol/Makefile ============================================================================== --- head/biology/protomol/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/biology/protomol/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -6,8 +6,7 @@ PORTVERSION= 2.0.3 PORTREVISION= 11 CATEGORIES= biology MASTER_SITES= SF/${PORTNAME}/ProtoMol/${PORTVERSION} -DISTNAME= ${PORTNAME}-${PORTVERSION}-tar.gz -EXTRACT_SUFX= # empty +DISTFILES= ${DISTNAME}-tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= OO, component based, framework for molecular dynamics (MD) simulations Modified: head/cad/alliance/Makefile ============================================================================== --- head/cad/alliance/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/cad/alliance/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= alliance -PORTVERSION= 5.0.20120515 +DISTVERSION= 5.0-20120515 CATEGORIES= cad MASTER_SITES= http://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \ http://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/ \ http://www-asim.lip6.fr/pub/alliance/distribution/5.0/ -DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org COMMENT= Complete set of CAD tools and libraries for VLSI design Modified: head/cad/electric/Makefile ============================================================================== --- head/cad/electric/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/cad/electric/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,8 +5,7 @@ PORTNAME= electric PORTVERSION= 7.0.0 PORTREVISION= 4 CATEGORIES= cad -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= GNU DISTNAME= ${PORTNAME}-${PORTVERSION:C/^(...)\./\1/} MAINTAINER= ports@FreeBSD.org Modified: head/cad/gnucap/Makefile ============================================================================== --- head/cad/gnucap/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/cad/gnucap/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= gnucap -PORTVERSION= 2009.12.07 +DISTVERSION= 2009-12-07 CATEGORIES= cad MASTER_SITES= http://www.gnucap.org/devel/ \ http://www.gnucap.org/devel/archive/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g} MAINTAINER= ports@FreeBSD.org COMMENT= The GNU Circuit Analysis Package Modified: head/cad/tochnog/Makefile ============================================================================== --- head/cad/tochnog/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/cad/tochnog/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -8,7 +8,7 @@ CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/Tochnog%20Latest%20January%202014 DISTFILES= Sources${EXTRACT_SUFX} gid${EXTRACT_SUFX} \ tools${EXTRACT_SUFX} test${EXTRACT_SUFX} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} +DIST_SUBDIR= ${DISTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Free explicit/implicit Finite Element Program Modified: head/chinese/cce/Makefile ============================================================================== --- head/chinese/cce/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/chinese/cce/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -3,10 +3,10 @@ PORTNAME= cce PORTVERSION= 0.51 +DISTVERSIONSUFFIX= -02132004-dist PORTREVISION= 2 CATEGORIES= chinese MASTER_SITES= SF/${PORTNAME}2k/${PORTNAME}/Ver_${PORTVERSION}_02132004 -DISTNAME= ${PORTNAME}-${PORTVERSION}-02132004-dist PATCH_SITES= http://www.chinatinco.com/freebsd/cce/ \ http://www.525183.com/freebsd/cce/ \ Modified: head/chinese/fqterm/Makefile ============================================================================== --- head/chinese/fqterm/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/chinese/fqterm/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -3,11 +3,10 @@ PORTNAME= fqterm PORTVERSION= 0.9.3 +DISTVERSIONSUFFIX= -src-r569 PORTREVISION= 8 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION}-src-r569${SUTRACT_SUFFIX} +MASTER_SITES= GOOGLE_CODE/${PORTNAME} MAINTAINER= darcsis@gmail.com COMMENT= BBS client for BSD/Linux Modified: head/chinese/ibus-chewing/Makefile ============================================================================== --- head/chinese/ibus-chewing/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/chinese/ibus-chewing/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,7 +4,6 @@ PORTNAME= ibus-chewing PORTVERSION= 1.4.14 CATEGORIES= chinese -DISTNAME= ${PORTNAME}-${PORTVERSION}-Source MAINTAINER= eric@camachat.org COMMENT= Chewing engine for IBus Modified: head/chinese/ibus-chewing/distinfo ============================================================================== --- head/chinese/ibus-chewing/distinfo Mon May 11 18:31:01 2015 (r386096) +++ head/chinese/ibus-chewing/distinfo Mon May 11 18:34:57 2015 (r386097) @@ -1,2 +1,2 @@ -SHA256 (ibus-chewing-1.4.14-Source_GH0.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691 -SIZE (ibus-chewing-1.4.14-Source_GH0.tar.gz) = 91669 +SHA256 (definite-ibus-chewing-1.4.14_GH0.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691 +SIZE (definite-ibus-chewing-1.4.14_GH0.tar.gz) = 91669 Modified: head/chinese/reciteword/Makefile ============================================================================== --- head/chinese/reciteword/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/chinese/reciteword/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,10 +4,10 @@ PORTNAME= reciteword PORTVERSION= 0.8.5 CATEGORIES= chinese -MASTER_SITES= SF:src \ +MASTER_SITES= SF \ SF/${PORTNAME}/${PORTNAME}-books/${PORTVERSION}:books \ SF/${PORTNAME}/${PORTNAME}-dicts/0.8.2:dicts -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:src \ +DISTFILES= ${DISTNAME}.tar.bz2 \ ${PORTNAME}-books-${PORTVERSION}.tar.bz2:books \ ${PORTNAME}-dicts-0.8.2.tar.bz2:dicts Modified: head/comms/lirc/Makefile ============================================================================== --- head/comms/lirc/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/comms/lirc/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -7,7 +7,6 @@ PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= comms MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION} -DISTNAME= ${PORTNAME}-${PORTVERSION:S/p1/-pre1/} MAINTAINER= nox@FreeBSD.org COMMENT= Linux Infrared Remote Control Modified: head/comms/ncid/Makefile ============================================================================== --- head/comms/ncid/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/comms/ncid/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,7 +4,7 @@ PORTNAME= ncid PORTVERSION= 1.0 CATEGORIES= comms -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.1//g} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= cpm@fbsd.es Modified: head/converters/pdf2djvu/Makefile ============================================================================== --- head/converters/pdf2djvu/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/converters/pdf2djvu/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -6,7 +6,7 @@ PORTVERSION= 0.7.17 PORTREVISION= 4 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX} +DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= darcsis@gmail.com COMMENT= Pdf2djvu creates DjVu files from PDF files Modified: head/databases/flamerobin/Makefile ============================================================================== --- head/databases/flamerobin/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/flamerobin/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,7 +5,7 @@ PORTNAME= flamerobin PORTVERSION= 0.9.2 PORTREVISION= 4 CATEGORIES= databases -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org Modified: head/databases/hbase/Makefile ============================================================================== --- head/databases/hbase/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/hbase/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,11 +4,10 @@ PORTNAME= hbase PORTVERSION= 0.98.9 CATEGORIES= databases 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} -DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven DIST_SUBDIR= hadoop MAINTAINER= demon@FreeBSD.org Modified: head/databases/jakarta-commons-dbutils/Makefile ============================================================================== --- head/databases/jakarta-commons-dbutils/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/jakarta-commons-dbutils/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,8 +4,7 @@ PORTNAME= commons-dbutils PORTVERSION= 1.6 CATEGORIES= databases 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 Modified: head/databases/java-mybatis/Makefile ============================================================================== --- head/databases/java-mybatis/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/java-mybatis/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,7 +5,7 @@ PORTNAME= mybatis PORTVERSION= 3.0.3 PORTREVISION= 1 CATEGORIES= databases devel java -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= java- DISTFILES= ${PORTNAME}-${PORTVERSION}-bundle${EXTRACT_SUFX} Modified: head/databases/mysql-connector-c/Makefile ============================================================================== --- head/databases/mysql-connector-c/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/mysql-connector-c/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,8 +4,7 @@ PORTNAME= mysql-connector-c PORTVERSION= 6.1.5 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_MYSQL} -MASTER_SITE_SUBDIR= Connector-C +MASTER_SITES= MYSQL/Connector-C DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org Modified: head/databases/mysql-connector-odbc/Makefile ============================================================================== --- head/databases/mysql-connector-odbc/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/mysql-connector-odbc/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,8 +4,7 @@ PORTNAME= mysql-connector-odbc PORTVERSION= 5.3.4 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_MYSQL} -MASTER_SITE_SUBDIR= Connector-ODBC/5.3 +MASTER_SITES= MYSQL/Connector-ODBC/5.3 PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER} DISTNAME= ${PORTNAME}-${PORTVERSION}-src Modified: head/databases/ocaml-dbm/Makefile ============================================================================== --- head/databases/ocaml-dbm/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/ocaml-dbm/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -7,7 +7,6 @@ CATEGORIES= databases MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/728/ PKGNAMEPREFIX= ocaml- DISTNAME= caml${PORTNAME}-${PORTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= jaapb@kerguelen.org COMMENT= OCaml binding to the NDBM and GDBM database library @@ -16,6 +15,7 @@ LICENSE= LGPL20 CONFLICTS= ocaml-[0-3]* ocaml-nox11-[0-3]* +USES= tar:tgz HAS_CONFIGURE= yes USE_OCAML= yes DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} Modified: head/databases/pear-DB/Makefile ============================================================================== --- head/databases/pear-DB/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/pear-DB/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,7 +5,6 @@ PORTNAME= DB PORTVERSION= 1.7.14 PORTEPOCH= 1 CATEGORIES= databases www pear -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/RC/} MAINTAINER= ports@FreeBSD.org COMMENT= PEAR Database Abstraction Layer Modified: head/databases/pyspatialite/Makefile ============================================================================== --- head/databases/pyspatialite/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/databases/pyspatialite/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,9 +5,9 @@ PORTNAME= pyspatialite PORTVERSION= 3.0.1 PORTREVISION= 5 CATEGORIES= databases python -MASTER_SITES= CHEESESHOP:pyspatialite +MASTER_SITES= CHEESESHOP/source/p/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-0${EXTRACT_SUFX}:pyspatialite +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-0 MAINTAINER= coder@tuxfamily.org COMMENT= DB-API 2.0 interface for SQLite 3.x with Spatialite @@ -24,7 +24,6 @@ USES= iconv python USE_PYTHON= distutils PYDISTUTILS_PKGNAME= pyspatialite - .include <bsd.port.pre.mk> .if empty(ICONV_LIB) Modified: head/deskutils/ganttproject/Makefile ============================================================================== --- head/deskutils/ganttproject/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/deskutils/ganttproject/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,7 +5,7 @@ PORTNAME= ganttproject PORTVERSION= 2.6.2 PORTREVISION= 1 CATEGORIES= deskutils java -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${PORTVERSION}-r1544 MAINTAINER= ports@FreeBSD.org Modified: head/deskutils/treesheets/Makefile ============================================================================== --- head/deskutils/treesheets/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/deskutils/treesheets/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -4,7 +4,6 @@ PORTNAME= treesheets PORTVERSION= 0.0.20150405 CATEGORIES= deskutils -DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= lightside@gmx.com COMMENT= Free form data organizer Modified: head/deskutils/treesheets/distinfo ============================================================================== --- head/deskutils/treesheets/distinfo Mon May 11 18:31:01 2015 (r386096) +++ head/deskutils/treesheets/distinfo Mon May 11 18:34:57 2015 (r386097) @@ -1,2 +1,2 @@ -SHA256 (treesheets-0.0.20150405_GH0.tar.gz) = d16f215a857054098b10f5402ef35efe37ada6f8d91161af12c5f1d2fc8b97fb -SIZE (treesheets-0.0.20150405_GH0.tar.gz) = 1788802 +SHA256 (aardappel-treesheets-0.0.20150405-b994c63_GH0.tar.gz) = d16f215a857054098b10f5402ef35efe37ada6f8d91161af12c5f1d2fc8b97fb +SIZE (aardappel-treesheets-0.0.20150405-b994c63_GH0.tar.gz) = 1788802 Modified: head/devel/apache-ant/Makefile ============================================================================== --- head/devel/apache-ant/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/apache-ant/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/cdk/Makefile ============================================================================== --- head/devel/cdk/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/cdk/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/cscout/Makefile ============================================================================== --- head/devel/cscout/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/cscout/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/cvsmonitor/Makefile ============================================================================== --- head/devel/cvsmonitor/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/cvsmonitor/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/gdb66/Makefile ============================================================================== --- head/devel/gdb66/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/gdb66/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/git/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/hadoop/Makefile ============================================================================== --- head/devel/hadoop/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/hadoop/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/hive/Makefile ============================================================================== --- head/devel/hive/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/hive/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/jakarta-commons-configuration/Makefile ============================================================================== --- head/devel/jakarta-commons-configuration/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/jakarta-commons-configuration/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/jakarta-commons-daemon/Makefile ============================================================================== --- head/devel/jakarta-commons-daemon/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/jakarta-commons-daemon/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/jakarta-commons-io/Makefile ============================================================================== --- head/devel/jakarta-commons-io/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/jakarta-commons-io/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/jakarta-commons-jxpath/Makefile ============================================================================== --- head/devel/jakarta-commons-jxpath/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/jakarta-commons-jxpath/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/jakarta-commons-modeler/Makefile ============================================================================== --- head/devel/jakarta-commons-modeler/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/jakarta-commons-modeler/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/jgoodies-common/Makefile ============================================================================== --- head/devel/jgoodies-common/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/jgoodies-common/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/libassa/Makefile ============================================================================== --- head/devel/libassa/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/libassa/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/looks/Makefile ============================================================================== --- head/devel/looks/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/looks/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/oozie/Makefile ============================================================================== --- head/devel/oozie/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/oozie/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/openzz/Makefile ============================================================================== --- head/devel/openzz/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/openzz/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/p5-App-GitGot/Makefile ============================================================================== --- head/devel/p5-App-GitGot/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/p5-App-GitGot/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/p5-Class-C3-Componentised/Makefile ============================================================================== --- head/devel/p5-Class-C3-Componentised/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/p5-Class-C3-Componentised/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/p5-DateTime-Set/Makefile ============================================================================== --- head/devel/p5-DateTime-Set/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/p5-DateTime-Set/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/pig/Makefile ============================================================================== --- head/devel/pig/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/pig/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/py-json-py/Makefile ============================================================================== --- head/devel/py-json-py/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/py-json-py/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/ruby-aspectr/Makefile ============================================================================== --- head/devel/ruby-aspectr/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/ruby-aspectr/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/ruby-rbbr/Makefile ============================================================================== --- head/devel/ruby-rbbr/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/ruby-rbbr/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/ruby-tzfile/Makefile ============================================================================== --- head/devel/ruby-tzfile/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/ruby-tzfile/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/sigslot/Makefile ============================================================================== --- head/devel/sigslot/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/sigslot/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/spark/Makefile ============================================================================== --- head/devel/spark/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/spark/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/swank-clojure/Makefile ============================================================================== --- head/devel/swank-clojure/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/swank-clojure/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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+ Modified: head/devel/swank-clojure/distinfo ============================================================================== --- head/devel/swank-clojure/distinfo Mon May 11 18:31:01 2015 (r386096) +++ head/devel/swank-clojure/distinfo Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/tinylaf/Makefile ============================================================================== --- head/devel/tinylaf/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/tinylaf/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/vera++/Makefile ============================================================================== --- head/devel/vera++/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/vera++/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/devel/xdg-utils/Makefile ============================================================================== --- head/devel/xdg-utils/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/devel/xdg-utils/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -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 Modified: head/dns/nslint/Makefile ============================================================================== --- head/dns/nslint/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/dns/nslint/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -6,7 +6,6 @@ PORTVERSION= 3.1 CATEGORIES= dns MASTER_SITES= ftp://ftp.ee.lbl.gov/ \ LOCAL/ehaupt -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a/a/} MAINTAINER= ehaupt@FreeBSD.org COMMENT= Perform consistency checks on DNS zone files Modified: head/dns/radns/Makefile ============================================================================== --- head/dns/radns/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/dns/radns/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= radns -PORTVERSION= 20110809.2 -DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/} +DISTVERSION= 20110809-2 CATEGORIES= dns MASTER_SITES= http://hack.org/mc/hacks/radns/ Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/editors/emacs-devel/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -3,13 +3,12 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER}.${EMACS_REV} +DISTVERSIONSUFFIX= .${GIT_REV} PORTEPOCH= 2 CATEGORIES= editors ipv6 -MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= ashish +MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \ + LOCAL/ashish PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-${PORTVERSION}.${GIT_REV} MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros Modified: head/editors/fte/Makefile ============================================================================== --- head/editors/fte/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/editors/fte/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -5,8 +5,8 @@ PORTNAME= fte PORTVERSION= 20110708 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -DISTFILES= ${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \ - ${PORTNAME}-${PORTVERSION:S/./b/}-common.zip +DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \ + ${DISTNAME}-common${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org Modified: head/editors/gnotepad+/Makefile ============================================================================== --- head/editors/gnotepad+/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/editors/gnotepad+/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -7,7 +7,7 @@ PORTREVISION= 9 CATEGORIES= editors www gnome MASTER_SITES= SF/gnotepad/gnotepad-stable/${PORTVERSION} \ SF/gnotepad/gnotepad%20User_s%20Manual/${DOCVERSION}:doc -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Simple GTK-based text/HTML editor Modified: head/editors/jed/Makefile ============================================================================== --- head/editors/jed/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/editors/jed/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= jed -PORTVERSION= 0.99.19 +DISTVERSION= 0.99-19 PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \ ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v${PORTVERSION:R}/ \ ftp://ftp.ntua.gr/pub/lang/slang/jed/v${PORTVERSION:R}/ -DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= garga@FreeBSD.org COMMENT= SLang-based text editor Modified: head/editors/lazarus/Makefile ============================================================================== --- head/editors/lazarus/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/editors/lazarus/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -3,11 +3,11 @@ PORTNAME= lazarus PORTVERSION= 1.2.6 +DISTVERSIONSUFFIX= -0 PORTREVISION?= 0 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} -DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/-0/} DIST_SUBDIR= freepascal MAINTAINER?= freebsd-fpc@FreeBSD.org Modified: head/editors/texworks/Makefile ============================================================================== --- head/editors/texworks/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/editors/texworks/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -3,10 +3,10 @@ PORTNAME= texworks PORTVERSION= 0.4.5 +DISTVERSIONSUFFIX= -r${VCS_REVISION} PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= GOOGLE_CODE -DISTNAME= ${PORTNAME}-${PORTVERSION}-r${VCS_REVISION} MAINTAINER= ports@FreeBSD.org COMMENT= Simple TeX front-end program Modified: head/emulators/kqemu-kmod-devel/Makefile ============================================================================== --- head/emulators/kqemu-kmod-devel/Makefile Mon May 11 18:31:01 2015 (r386096) +++ head/emulators/kqemu-kmod-devel/Makefile Mon May 11 18:34:57 2015 (r386097) @@ -2,15 +2,13 @@ # $FreeBSD$ PORTNAME= kqemu -PORTVERSION= 1.4.0.p1 +DISTVERSION= 1.4.0pre1 PORTREVISION= 5 CATEGORIES= emulators *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505111834.t4BIYwFQ010636>