summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--archivers/Makefile2
-rw-r--r--archivers/cmdpack/Makefile19
-rw-r--r--archivers/cmdpack/distinfo3
-rw-r--r--archivers/cmdpack/pkg-descr (renamed from archivers/ecm/pkg-descr)2
-rw-r--r--archivers/ecm/Makefile29
-rw-r--r--archivers/ecm/distinfo2
-rw-r--r--math/gmp-ecm/Makefile3
8 files changed, 26 insertions, 35 deletions
diff --git a/MOVED b/MOVED
index e5508521b64b..30c15d012f71 100644
--- a/MOVED
+++ b/MOVED
@@ -16013,3 +16013,4 @@ devel/py-futures||2020-01-02|Uses Python 2.7 which is EOLed upstream
devel/py-singledispatch||2020-01-02|Uses Python 2.7 which is EOLed upstream
graphics/py-pillow6|graphics/pillow|2020-01-02|Uses Python 2.7 which is EOLed upstream
www/wt3|www/wt|2021-01-03|Has expired: Upstream end of life, switch to www/wt instead
+archivers/ecm|archivers/cmdpack|2021-01-04|ECM is now included in cmdpack
diff --git a/archivers/Makefile b/archivers/Makefile
index e467b149fc0e..f0572e6b2bfb 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -17,13 +17,13 @@
SUBDIR += bzip2
SUBDIR += c-blosc
SUBDIR += cabextract
+ SUBDIR += cmdpack
SUBDIR += dact
SUBDIR += deb2targz
SUBDIR += deco
SUBDIR += deutex
SUBDIR += dpkg
SUBDIR += dzip
- SUBDIR += ecm
SUBDIR += engrampa
SUBDIR += erlang-snappy
SUBDIR += fastjar
diff --git a/archivers/cmdpack/Makefile b/archivers/cmdpack/Makefile
new file mode 100644
index 000000000000..a898dc73f53c
--- /dev/null
+++ b/archivers/cmdpack/Makefile
@@ -0,0 +1,19 @@
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
+# $FreeBSD$
+
+PORTNAME= cmdpack
+DISTVERSION= 1.06
+CATEGORIES= archivers
+
+MAINTAINER= ehaupt@FreeBSD.org
+COMMENT= Compresses CD images by stripping unnecessary EDC/ECC data
+
+LICENSE= GPLv2
+
+BUILD_DEPENDS= a2x:textproc/asciidoc
+
+USES= gmake
+USE_GITHUB= yes
+GH_ACCOUNT= chungy
+
+.include <bsd.port.mk>
diff --git a/archivers/cmdpack/distinfo b/archivers/cmdpack/distinfo
new file mode 100644
index 000000000000..f4ed6f137216
--- /dev/null
+++ b/archivers/cmdpack/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1609772628
+SHA256 (chungy-cmdpack-1.06_GH0.tar.gz) = 6ce7029c0f2b0fbc6a1e26fb3ad8003ed18836aa3ef35f148ec51cde0b703307
+SIZE (chungy-cmdpack-1.06_GH0.tar.gz) = 71738
diff --git a/archivers/ecm/pkg-descr b/archivers/cmdpack/pkg-descr
index f9598428682d..5b4dd0e7f2c9 100644
--- a/archivers/ecm/pkg-descr
+++ b/archivers/cmdpack/pkg-descr
@@ -4,4 +4,4 @@ or similar) by stripping unnecessary EDC/ECC data.
The space saved depends on the number of sectors with unnecessary EDC/ECC data
in them, which will depend on the specific type of CD.
-WWW: https://web.archive.org/web/20140227165748/www.neillcorlett.com/ecm/
+WWW: https://github.com/chungy/cmdpack
diff --git a/archivers/ecm/Makefile b/archivers/ecm/Makefile
deleted file mode 100644
index 1293fe91edea..000000000000
--- a/archivers/ecm/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Emanuel Haupt <ehaupt@critical.ch>
-# $FreeBSD$
-
-PORTNAME= ecm
-PORTVERSION= 1.0
-PORTREVISION= 1
-CATEGORIES= archivers
-MASTER_SITES= LOCAL/ehaupt
-
-MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= Compresses CD images by stripping unnecessary EDC/ECC data
-
-LICENSE= GPLv2
-
-CONFLICTS= gmp-ecm-[0-9]*
-
-PLIST_FILES= bin/ecm bin/unecm
-PORTDOCS= format.txt
-
-OPTIONS_DEFINE= DOCS
-
-do-install:
-.for f in ${PORTNAME} un${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
-.endfor
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/archivers/ecm/distinfo b/archivers/ecm/distinfo
deleted file mode 100644
index f9d0a36cc458..000000000000
--- a/archivers/ecm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ecm-1.0.tar.gz) = e7b1c451893a37df85ebbadcd7efa6b95ee7583bc7030c1f8842e46e292e021a
-SIZE (ecm-1.0.tar.gz) = 23284
diff --git a/math/gmp-ecm/Makefile b/math/gmp-ecm/Makefile
index 469abba8c440..13114b9ba7d2 100644
--- a/math/gmp-ecm/Makefile
+++ b/math/gmp-ecm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gmp-ecm
DISTVERSION= 7.0.4
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/36224/
DISTNAME= ecm-${DISTVERSION}
@@ -17,8 +18,6 @@ LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libgmp.so:math/gmp
-CONFLICTS= ecm-[0-9]*
-
USES= gmake libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ac_cv_prog_XSLTPROC=no \