diff options
author | mat <mat@FreeBSD.org> | 2015-05-12 02:34:57 +0800 |
---|---|---|
committer | mat <mat@FreeBSD.org> | 2015-05-12 02:34:57 +0800 |
commit | d843ecd4966c8a5bed60cf3aaeb27edb6b5b2389 (patch) | |
tree | 634e1ef4990207301493f26b46d80abe56b9f2b3 /sysutils | |
parent | 925f5606448b4e40652ba0a13bfb8cd44c8aac89 (diff) | |
download | freebsd-ports-graphics-d843ecd4966c8a5bed60cf3aaeb27edb6b5b2389.tar.gz freebsd-ports-graphics-d843ecd4966c8a5bed60cf3aaeb27edb6b5b2389.tar.zst freebsd-ports-graphics-d843ecd4966c8a5bed60cf3aaeb27edb6b5b2389.zip |
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
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/deltup/Makefile | 2 | ||||
-rw-r--r-- | sysutils/fcron/Makefile | 3 | ||||
-rw-r--r-- | sysutils/fpkg/Makefile | 2 | ||||
-rw-r--r-- | sysutils/freesbie/Makefile | 3 | ||||
-rw-r--r-- | sysutils/fusefs-sqlfs/Makefile | 2 | ||||
-rw-r--r-- | sysutils/graveman/Makefile | 3 | ||||
-rw-r--r-- | sysutils/hourglass/Makefile | 2 | ||||
-rw-r--r-- | sysutils/jdiskreport/Makefile | 3 | ||||
-rw-r--r-- | sysutils/osquery/Makefile | 2 | ||||
-rw-r--r-- | sysutils/osquery/distinfo | 4 | ||||
-rw-r--r-- | sysutils/progsreiserfs/Makefile | 3 | ||||
-rw-r--r-- | sysutils/qzeitgeist/Makefile | 3 | ||||
-rw-r--r-- | sysutils/serf/Makefile | 4 | ||||
-rw-r--r-- | sysutils/serf/distinfo | 4 | ||||
-rw-r--r-- | sysutils/testdisk/Makefile | 2 | ||||
-rw-r--r-- | sysutils/userneu-devel/Makefile | 2 | ||||
-rw-r--r-- | sysutils/userneu/Makefile | 2 | ||||
-rw-r--r-- | sysutils/xen-tools/Makefile | 2 |
18 files changed, 21 insertions, 27 deletions
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile index b2657478bb8..c35684987cc 100644 --- a/sysutils/deltup/Makefile +++ b/sysutils/deltup/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://deltup.org/e107_files/downloads/ \ LOCAL/rafan \ http://www.bzip.org/${BZIP2_102}/:bzip2102src \ http://www.bzip.org/${BZIP2_103}/:bzip2103src -DISTFILES+= ${PORTNAME}-${PORTVERSION}.tar.gz ${BZIP2_102_SOURCE}:bzip2102src ${BZIP2_103_SOURCE}:bzip2103src +DISTFILES+= ${DISTNAME}.tar.gz ${BZIP2_102_SOURCE}:bzip2102src ${BZIP2_103_SOURCE}:bzip2103src MAINTAINER= novel@FreeBSD.org COMMENT= Source delta update program diff --git a/sysutils/fcron/Makefile b/sysutils/fcron/Makefile index a9dc47791dd..c6b6733c277 100644 --- a/sysutils/fcron/Makefile +++ b/sysutils/fcron/Makefile @@ -5,10 +5,9 @@ PORTNAME= fcron PORTVERSION= 3.0.6 PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SUNSITE} \ +MASTER_SITES= SUNSITE/system/daemons/cron \ http://fcron.free.fr/archives/ \ ftp://ftp.seul.org/pub/fcron/ -MASTER_SITE_SUBDIR= system/daemons/cron DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= rde@tavi.co.uk diff --git a/sysutils/fpkg/Makefile b/sysutils/fpkg/Makefile index dd6ee3243fe..15fd9241915 100644 --- a/sysutils/fpkg/Makefile +++ b/sysutils/fpkg/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://voodoo.bawue.com/download/ \ http://www.shimazu.org/fpkg/ -DISTFILES= ${PORTNAME}-${PORTVERSION} +EXTRACT_SUFX= EXTRACT_ONLY= MAINTAINER= y.shimazu@nifty.com diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile index df5a8860fdb..ae74014cfbd 100644 --- a/sysutils/freesbie/Makefile +++ b/sysutils/freesbie/Makefile @@ -5,8 +5,7 @@ PORTNAME= freesbie PORTVERSION= 2.0.20070710 PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= riggs/freesbie +MASTER_SITES= LOCAL/riggs/freesbie DISTNAME= ${PORTNAME}-${PORTVERSION:S/2.0.//} MAINTAINER= riggs@FreeBSD.org diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile index 10e936bb215..ff7bd1bd911 100644 --- a/sysutils/fusefs-sqlfs/Makefile +++ b/sysutils/fusefs-sqlfs/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 1.1 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SAVANNAH} +MASTER_SITES= SAVANNAH MASTER_SITE_SUBDIR= libsqlfs PKGNAMEPREFIX= fusefs- DISTNAME= lib${PORTNAME}-${PORTVERSION} diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile index fc6360a6324..0784166be01 100644 --- a/sysutils/graveman/Makefile +++ b/sysutils/graveman/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= graveman -PORTVERSION= 0.3.12.5 +DISTVERSION= 0.3.12-5 PORTREVISION= 11 CATEGORIES= sysutils MASTER_SITES= http://graveman.tuxfamily.org/sources/ -DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/} MAINTAINER= ports@FreeBSD.org COMMENT= Another GTK2 frontend for cdrecord, mkisofs, readcd, and sox diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile index ed17fd3cef3..89ccf75a18c 100644 --- a/sysutils/hourglass/Makefile +++ b/sysutils/hourglass/Makefile @@ -2,9 +2,9 @@ PORTNAME= hourglass PORTVERSION= 1.0.1 +DISTVERSIONSUFFIX= b CATEGORIES= sysutils parallel MASTER_SITES= http://www.cs.utah.edu/~regehr/hourglass/ -DISTNAME= ${PORTNAME}-${PORTVERSION}b MAINTAINER= jadawin@FreeBSD.org COMMENT= Real-time application to learn how CPU scheduling works diff --git a/sysutils/jdiskreport/Makefile b/sysutils/jdiskreport/Makefile index bfbf6cbe66c..c69c756301f 100644 --- a/sysutils/jdiskreport/Makefile +++ b/sysutils/jdiskreport/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= jdiskreport -PORTVERSION= 1.4.1 +DISTVERSION= 1_4_1 CATEGORIES= sysutils java MASTER_SITES= http://www.jGoodies.com/download/${PORTNAME}/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S,.,_,g} MAINTAINER= jon@witchspace.com COMMENT= Java program to graphically display disk usage statistics diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile index 7fc188bab50..162f86909a7 100644 --- a/sysutils/osquery/Makefile +++ b/sysutils/osquery/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= GH:ghc \ https://codeload.github.com/${PORTNAME}/third-party/tar.gz/${PORTVERSION}?dummy=/:gh -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:ghc \ +DISTFILES= ${DISTNAME}.tar.gz:ghc \ third-party-${PORTVERSION}.tar.gz:gh MAINTAINER= zi@FreeBSD.org diff --git a/sysutils/osquery/distinfo b/sysutils/osquery/distinfo index b5977a2bc91..1ad8e719843 100644 --- a/sysutils/osquery/distinfo +++ b/sysutils/osquery/distinfo @@ -1,4 +1,4 @@ -SHA256 (osquery-1.4.5.tar.gz) = b0812eec4ca53eb6ada4692330caaed00ed1e50ead43b99486b3d15139369738 -SIZE (osquery-1.4.5.tar.gz) = 412622 +SHA256 (facebook-osquery-1.4.5_GH0.tar.gz) = b0812eec4ca53eb6ada4692330caaed00ed1e50ead43b99486b3d15139369738 +SIZE (facebook-osquery-1.4.5_GH0.tar.gz) = 412622 SHA256 (third-party-1.4.5.tar.gz) = 06897b9ddf637c61f5c9e90f640b9f8c50c124d6276058a71f7d952439c8e58f SIZE (third-party-1.4.5.tar.gz) = 6073986 diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile index 3ecd6c2d53f..3503ea95077 100644 --- a/sysutils/progsreiserfs/Makefile +++ b/sysutils/progsreiserfs/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= progsreiserfs -PORTVERSION= 0.3.1.r8 +DISTVERSION= 0.3.1-rc8 PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= http://www.cgsecurity.org/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/} MAINTAINER= ports@FreeBSD.org COMMENT= Utilities and library to manipulate ReiserFS partitions diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile index 4217f9acda4..7ee6bf6f3d0 100644 --- a/sysutils/qzeitgeist/Makefile +++ b/sysutils/qzeitgeist/Makefile @@ -4,9 +4,8 @@ PORTNAME= qzeitgeist PORTVERSION= 0.8.0 PORTREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_KDE:C@$@:kde@} \ +MASTER_SITES= KDE/stable/lib${PORTNAME}/${PORTVERSION}/src/:kde \ http://launchpad.net/zeitgeist/${ZEITGEIST_VERSION:R}/${ZEITGEIST_VERSION}/+download/ -MASTER_SITE_SUBDIR= stable/lib${PORTNAME}/${PORTVERSION}/src/:kde DISTNAME= lib${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:kde \ zeitgeist-${ZEITGEIST_VERSION}.tar.gz diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile index 07b7f103623..4e85d7bf424 100644 --- a/sysutils/serf/Makefile +++ b/sysutils/serf/Makefile @@ -4,7 +4,7 @@ PORTNAME= serf PORTVERSION= 0.6.4 DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \ +MASTER_SITES= GH \ https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz?dummy=/:group2 \ https://github.com/armon/go-metrics/archive/eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz?dummy=/:group3 \ https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz?dummy=/:group4 \ @@ -18,7 +18,7 @@ MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAM https://github.com/miekg/dns/archive/b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641.tar.gz?dummy=/:group12 \ https://github.com/hashicorp/go.net/archive/cbad13bf000d0cbdbc71506b26e94bcc72bbe74d.tar.gz?dummy=/:group13 PKGNAMEPREFIX= hashicorp- -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:group1 \ +DISTFILES= ${DISTNAME}.tar.gz \ armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz:group2 \ armon_go-metrics_eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz:group3 \ hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz:group4 \ diff --git a/sysutils/serf/distinfo b/sysutils/serf/distinfo index 72bbe9e0f33..31dcaa37e45 100644 --- a/sysutils/serf/distinfo +++ b/sysutils/serf/distinfo @@ -1,5 +1,5 @@ -SHA256 (serf-0.6.4.tar.gz) = 452540c9a475b45cacb4a883108f41aab3198b8e9b41ba0ba957325c1d1fded8 -SIZE (serf-0.6.4.tar.gz) = 571489 +SHA256 (hashicorp-serf-v0.6.4_GH0.tar.gz) = 452540c9a475b45cacb4a883108f41aab3198b8e9b41ba0ba957325c1d1fded8 +SIZE (hashicorp-serf-v0.6.4_GH0.tar.gz) = 571489 SHA256 (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52 SIZE (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = 2748 SHA256 (armon_go-metrics_eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz) = fd94820df854d11839891e6d7e8b63e816061d33f8bf45349486ef73482190db diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile index 6661dc3b7fe..3e0190ef1f3 100644 --- a/sysutils/testdisk/Makefile +++ b/sysutils/testdisk/Makefile @@ -4,7 +4,7 @@ PORTNAME= testdisk PORTVERSION= 6.14 CATEGORIES= sysutils MASTER_SITES= http://www.cgsecurity.org/ -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= flz@FreeBSD.org COMMENT= Tool to check and undelete partitions diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile index 10a0216ccd5..09737509f8e 100644 --- a/sysutils/userneu-devel/Makefile +++ b/sysutils/userneu-devel/Makefile @@ -3,13 +3,13 @@ PORTNAME= userneu PORTVERSION= 1.43 +DISTVERSIONSUFFIX= b PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://btw23.de/johannes/files/userneu/\ http://home.arcor.de/fehlner/fbsd_ports/\ http://home.arcor.de/teambushido/fbsd_ports/ PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-${PORTVERSION}b MAINTAINER= fehlner@gmx.de COMMENT= Account management and creation tool diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile index 26a70f7148a..4fee0d6dddf 100644 --- a/sysutils/userneu/Makefile +++ b/sysutils/userneu/Makefile @@ -3,12 +3,12 @@ PORTNAME= userneu PORTVERSION= 1.38 +DISTVERSIONSUFFIX= _1 PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://btw23.de/johannes/userneu/ \ http://home.arcor.de/fehlner/fbsd_ports/ \ http://home.arcor.de/teambushido/fbsd_ports/ -DISTNAME= ${PORTNAME}-${PORTVERSION}_1 MAINTAINER= fehlner@gmx.de COMMENT= Account management and creation tool diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index fee17aa35e7..98b8fc6f827 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than amd64" SEABIOSVERSION= 1.8.1 -DISTFILES+= ${PORTNAME}-${PORTVERSION}.tar.gz \ +DISTFILES+= ${DISTNAME}.tar.gz \ seabios-${SEABIOSVERSION}.tar.gz:seabios WRKSRC= ${WRKDIR}/xen-${PORTVERSION} |