Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history 
Taken from: FreeBSD
  • Loading branch information
@fichtner
fichtner committed Apr 22, 2022
1 parent 793e058 commit b37fbe8
Show file tree
Hide file tree
Showing 3,159 changed files with 108,270 additions and 29,990 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions accessibility/kmag/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1646143092
SHA256 (KDE/release-service/21.12.3/kmag-21.12.3.tar.xz) = 548f9b4c13eda644c0fb182eb78f6326c57f6cb7dc8a185fcb09dd585f31fd18
SIZE (KDE/release-service/21.12.3/kmag-21.12.3.tar.xz) = 709124
TIMESTAMP = 1650101797
SHA256 (KDE/release-service/22.04.0/kmag-22.04.0.tar.xz) = e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af
SIZE (KDE/release-service/22.04.0/kmag-22.04.0.tar.xz) = 707668
6 changes: 3 additions & 3 deletions accessibility/kmousetool/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1646143091
SHA256 (KDE/release-service/21.12.3/kmousetool-21.12.3.tar.xz) = 726e8c469b8abded02e2428f4172198f89983c09db42c5e0b171bdd16ac87804
SIZE (KDE/release-service/21.12.3/kmousetool-21.12.3.tar.xz) = 121460
TIMESTAMP = 1650101795
SHA256 (KDE/release-service/22.04.0/kmousetool-22.04.0.tar.xz) = 650167d0c87f4c114c517fdef23a01ba7ab4b7a5e7ec0edb64a3972400660f28
SIZE (KDE/release-service/22.04.0/kmousetool-22.04.0.tar.xz) = 121608
6 changes: 3 additions & 3 deletions accessibility/kmouth/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1646143093
SHA256 (KDE/release-service/21.12.3/kmouth-21.12.3.tar.xz) = 352e2dbde7a18fbea68a615dd12ba7f55aa4eaf49957a7db7feb6b51afb87377
SIZE (KDE/release-service/21.12.3/kmouth-21.12.3.tar.xz) = 2107316
TIMESTAMP = 1650101796
SHA256 (KDE/release-service/22.04.0/kmouth-22.04.0.tar.xz) = 3feabab5b75ddf54d017185b6b998ff1cbccf0cb1a23a8ccf6a546435f766017
SIZE (KDE/release-service/22.04.0/kmouth-22.04.0.tar.xz) = 2104452
1 change: 0 additions & 1 deletion accessibility/kmouth/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ man/man1/kmouth.1.gz
man/nl/man1/kmouth.1.gz
man/pt/man1/kmouth.1.gz
man/pt_BR/man1/kmouth.1.gz
man/ru/man1/kmouth.1.gz
man/sv/man1/kmouth.1.gz
man/uk/man1/kmouth.1.gz
share/applications/org.kde.kmouth.desktop
Expand Down
4 changes: 2 additions & 2 deletions accessibility/wlsunset/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TIMESTAMP = 1619384190
TIMESTAMP = 1650165989
SHA256 (wlsunset-0.2.0.tar.gz) = 88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
SIZE (wlsunset-0.2.0.tar.gz) = 12605
SHA256 (601dfc87ff6e.patch) = 6c484b40dd584a42a6d12bece902d9da5f6187ba0305a66e280a5cb0f015a7b8
SHA256 (601dfc87ff6e.patch) = 511ac13bda4fe128d1582220e793d98d007172324d78374014698e3e7ae2506c
SIZE (601dfc87ff6e.patch) = 1289
5 changes: 5 additions & 0 deletions archivers/7-zip/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ CFLAGS_aarch64?= -march=armv8-a+crc+crypto
NO_WRKSUBDIR= yes
BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Bundles/Alone2
DOS2UNIX_FILES= C/CpuArch.c \
C/7zCrc.c \
C/Aes.c \
C/AesOpt.c \
C/Sha1Opt.c \
C/Sha256Opt.c \
CPP/7zip/7zip_gcc.mak \
CPP/7zip/var_gcc.mak \
CPP/Windows/SystemInfo.cpp
Expand Down
11 changes: 11 additions & 0 deletions archivers/7-zip/files/patch-C_7zCrc.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- C/7zCrc.c.orig 2022-04-12 15:58:06 UTC
+++ C/7zCrc.c
@@ -71,7 +71,7 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *

#ifdef MY_CPU_LE

-#if defined(MY_CPU_ARM_OR_ARM64)
+#if defined(MY_CPU_ARM64)

// #pragma message("ARM*")

11 changes: 11 additions & 0 deletions archivers/7-zip/files/patch-C_Aes.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- C/Aes.c.orig 2022-04-12 15:57:33 UTC
+++ C/Aes.c
@@ -55,7 +55,7 @@ static Byte InvS[256];

#ifdef MY_CPU_X86_OR_AMD64
#define USE_HW_AES
-#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
+#elif defined(MY_CPU_ARM) && defined(MY_CPU_LE)
#if defined(__clang__)
#if (__clang_major__ >= 8) // fix that check
#define USE_HW_AES
38 changes: 38 additions & 0 deletions archivers/7-zip/files/patch-C_AesOpt.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--- C/AesOpt.c.orig 2022-04-12 15:59:22 UTC
+++ C/AesOpt.c
@@ -506,7 +506,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
#endif // ! USE_INTEL_VAES


-#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
+#elif defined(MY_CPU_ARM64) && defined(MY_CPU_LE)

#if defined(__clang__)
#if (__clang_major__ >= 8) // fix that check
@@ -773,4 +773,25 @@ AES_FUNC_START2 (AesCtr_Code_HW)

#endif // USE_HW_AES

-#endif // MY_CPU_ARM_OR_ARM64
+#else
+
+/* no USE_HW_AES */
+
+#pragma message("AES HW_SW stub was used")
+
+#define AES_TYPE_keys UInt32
+#define AES_TYPE_data Byte
+
+#define AES_FUNC_START(name) \
+ void MY_FAST_CALL name(UInt32 *p, Byte *data, size_t numBlocks) \
+
+#define AES_COMPAT_STUB(name) \
+ AES_FUNC_START(name); \
+ AES_FUNC_START(name ## _HW) \
+ { name(p, data, numBlocks); }
+
+AES_COMPAT_STUB (AesCbc_Encode)
+AES_COMPAT_STUB (AesCbc_Decode)
+AES_COMPAT_STUB (AesCtr_Code)
+
+#endif
26 changes: 17 additions & 9 deletions archivers/7-zip/files/patch-C_CpuArch.c
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
--- C/CpuArch.c.orig 2021-12-12 14:45:15 UTC
+++ C/CpuArch.c
@@ -417,6 +417,23 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
@@ -417,6 +417,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP

#include <sys/auxv.h>

+#if defined(__FreeBSD__)
+static UInt64 get_hwcap() {
+static unsigned long get_hwcap(int aux) {
+ unsigned long hwcap;
+ if(elf_aux_info(AT_HWCAP, &hwcap, sizeof(unsigned long)) != 0) {
+ return(0);
+ if (elf_aux_info(aux, &hwcap, sizeof hwcap) != 0) {
+ return 0;
+ }
+ return hwcap;
+}
+
+BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap() & HWCAP_CRC32; }
+#ifdef MY_CPU_ARM64
+BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP) & HWCAP_CRC32; }
+BoolInt CPU_IsSupported_NEON(void) { return 1; }
+BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap() & HWCAP_SHA1; }
+BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap() & HWCAP_SHA2; }
+BoolInt CPU_IsSupported_AES(void) { return get_hwcap() & HWCAP_AES; }
+BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP) & HWCAP_SHA1; }
+BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP) & HWCAP_SHA2; }
+BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP) & HWCAP_AES; }
+#else /* MY_CPU_ARM */
+BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_CRC32; }
+BoolInt CPU_IsSupported_NEON(void) { return get_hwcap(AT_HWCAP) & HWCAP_NEON; }
+BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP2) & HWCAP2_SHA1; }
+BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_SHA2; }
+BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_AES; }
+#endif
+
+#else // __FreeBSD__
+
#define USE_HWCAP

#ifdef USE_HWCAP
@@ -450,6 +467,7 @@ MY_HWCAP_CHECK_FUNC (SHA1)
@@ -450,6 +475,7 @@ MY_HWCAP_CHECK_FUNC (SHA1)
MY_HWCAP_CHECK_FUNC (SHA2)
MY_HWCAP_CHECK_FUNC (AES)

Expand Down
11 changes: 11 additions & 0 deletions archivers/7-zip/files/patch-C_Sha1Opt.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- C/Sha1Opt.c.orig 2022-04-12 16:00:26 UTC
+++ C/Sha1Opt.c
@@ -212,7 +212,7 @@ void MY_FAST_CALL Sha1_UpdateBlocks_HW(UInt32 state[5]

#endif // USE_HW_SHA

-#elif defined(MY_CPU_ARM_OR_ARM64)
+#elif defined(MY_CPU_ARM64)

#if defined(__clang__)
#if (__clang_major__ >= 8) // fix that check
11 changes: 11 additions & 0 deletions archivers/7-zip/files/patch-C_Sha256Opt.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- C/Sha256Opt.c.orig 2022-04-12 16:00:07 UTC
+++ C/Sha256Opt.c
@@ -212,7 +212,7 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[

#endif // USE_HW_SHA

-#elif defined(MY_CPU_ARM_OR_ARM64)
+#elif defined(MY_CPU_ARM64)

#if defined(__clang__)
#if (__clang_major__ >= 8) // fix that check
7 changes: 2 additions & 5 deletions archivers/advancecomp/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Created by: Radim Kolar

PORTNAME= advancecomp
DISTVERSIONPREFIX= v
DISTVERSION= 2.1-6
DISTVERSIONSUFFIX= -g7b08f7a
DISTVERSION= 2.3
CATEGORIES= archivers
MASTER_SITES= https://github.com/amadvance/advancecomp/releases/download/v${DISTVERSION}/

MAINTAINER= [email protected]
COMMENT= Recompression utilities for .ZIP, .PNG, .MNG, and .GZ files
Expand All @@ -15,8 +14,6 @@ LIB_DEPENDS= libzopfli.so:archivers/zopfli \
libdeflate.so:archivers/libdeflate

USES= autoreconf cpe
USE_GITHUB= yes
GH_ACCOUNT= amadvance
CPE_VENDOR= advancemame

GNU_CONFIGURE= yes
Expand Down
6 changes: 3 additions & 3 deletions archivers/advancecomp/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1636103106
SHA256 (amadvance-advancecomp-v2.1-6-g7b08f7a_GH0.tar.gz) = d87a6b3838a0331541dd784fe5c40ec3194a5672db0b44a3fbf951cdf3cc42d9
SIZE (amadvance-advancecomp-v2.1-6-g7b08f7a_GH0.tar.gz) = 1195162
TIMESTAMP = 1650053323
SHA256 (advancecomp-2.3.tar.gz) = 811f661dfbbdddefdcb5eaf133e403ca2af99328b850b22c1249f7bebe657578
SIZE (advancecomp-2.3.tar.gz) = 1292157
6 changes: 3 additions & 3 deletions archivers/ark/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1646142987
SHA256 (KDE/release-service/21.12.3/ark-21.12.3.tar.xz) = 4817458000a8f0c241cc59aed1c52ae4338c9d3c5f4f65a57080abb1ec5b60dc
SIZE (KDE/release-service/21.12.3/ark-21.12.3.tar.xz) = 2773432
TIMESTAMP = 1650101778
SHA256 (KDE/release-service/22.04.0/ark-22.04.0.tar.xz) = cb074b7d61e202fed8468daaa615724721f38dd3a126cb3071aa0d8380075fde
SIZE (KDE/release-service/22.04.0/ark-22.04.0.tar.xz) = 2777432
6 changes: 3 additions & 3 deletions archivers/ark/pkg-plist
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
bin/ark
share/qlogging-categories5/ark.categories
lib/libkerfuffle.so.%%KDE_APPLICATIONS_VERSION_SHORT%%
lib/libkerfuffle.so.%%KDE_APPLICATIONS_SHLIB_VER%%
%%QT_PLUGINDIR%%/kf5/parts/arkpart.so
%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_cli7z.so
%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_clirar.so
%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_cliunarchiver.so
Expand All @@ -16,6 +14,7 @@ lib/libkerfuffle.so.%%KDE_APPLICATIONS_SHLIB_VER%%
%%QT_PLUGINDIR%%/kf5/kfileitemaction/compressfileitemaction.so
%%QT_PLUGINDIR%%/kf5/kfileitemaction/extractfileitemaction.so
%%QT_PLUGINDIR%%/kf5/kio_dnd/extracthere.so
%%QT_PLUGINDIR%%/kf5/parts/arkpart.so
man/ca/man1/ark.1.gz
man/de/man1/ark.1.gz
man/es/man1/ark.1.gz
Expand All @@ -31,9 +30,9 @@ man/sv/man1/ark.1.gz
man/uk/man1/ark.1.gz
share/applications/org.kde.ark.desktop
share/config.kcfg/ark.kcfg
share/icons/hicolor/128x128/apps/ark.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/64x64/apps/ark.png
share/icons/hicolor/128x128/apps/ark.png
share/icons/hicolor/scalable/apps/ark.svgz
share/kservices5/ark_part.desktop
share/kservicetypes5/kerfufflePlugin.desktop
Expand Down Expand Up @@ -98,3 +97,4 @@ share/locale/uk/LC_MESSAGES/ark.mo
share/locale/zh_CN/LC_MESSAGES/ark.mo
share/locale/zh_TW/LC_MESSAGES/ark.mo
share/metainfo/org.kde.ark.appdata.xml
share/qlogging-categories5/ark.categories
3 changes: 1 addition & 2 deletions archivers/c-blosc2/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Created by: Po-Chuan Hsieh <[email protected]>

PORTNAME= c-blosc2
PORTVERSION= 2.0.4
PORTREVISION= 1
PORTVERSION= 2.1.0
DISTVERSIONPREFIX= v
CATEGORIES= archivers

Expand Down
6 changes: 3 additions & 3 deletions archivers/c-blosc2/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1635730865
SHA256 (Blosc-c-blosc2-v2.0.4_GH0.tar.gz) = 90c78edcc262759dd16d243141513310624bb4fda3d98ac34dcfb78255e151c1
SIZE (Blosc-c-blosc2-v2.0.4_GH0.tar.gz) = 2062503
TIMESTAMP = 1650228660
SHA256 (Blosc-c-blosc2-v2.1.0_GH0.tar.gz) = a9570f4101654c2fe2a706adcab0821cdbcf7523fcb6602407dda21b67fdacfd
SIZE (Blosc-c-blosc2-v2.1.0_GH0.tar.gz) = 2345202
11 changes: 0 additions & 11 deletions archivers/c-blosc2/files/patch-CMakeLists.txt
View file

This file was deleted.

6 changes: 3 additions & 3 deletions archivers/kf5-karchive/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1646566627
SHA256 (KDE/frameworks/5.92.0/karchive-5.92.0.tar.xz) = 5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae
SIZE (KDE/frameworks/5.92.0/karchive-5.92.0.tar.xz) = 986308
TIMESTAMP = 1648913735
SHA256 (KDE/frameworks/5.93.0/karchive-5.93.0.tar.xz) = 61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb
SIZE (KDE/frameworks/5.93.0/karchive-5.93.0.tar.xz) = 986312
3 changes: 1 addition & 2 deletions archivers/nfpm/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
PORTNAME= nfpm
DISTVERSIONPREFIX= v
DISTVERSION= 2.15.0
PORTREVISION= 1
DISTVERSION= 2.15.1
CATEGORIES= archivers

MAINTAINER= [email protected]
Expand Down
10 changes: 5 additions & 5 deletions archivers/nfpm/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TIMESTAMP = 1647731264
SHA256 (go/archivers_nfpm/nfpm-v2.15.0/v2.15.0.mod) = 8891343c0b6550b708611a75a9dbadb0fb2d3d1dacfdf52e55503a5c299cc923
SIZE (go/archivers_nfpm/nfpm-v2.15.0/v2.15.0.mod) = 3134
SHA256 (go/archivers_nfpm/nfpm-v2.15.0/v2.15.0.zip) = a9a59944462a07f89d5eec5021e3ac9872268c01c8b1ab934b5d53089af9a352
SIZE (go/archivers_nfpm/nfpm-v2.15.0/v2.15.0.zip) = 508739
TIMESTAMP = 1650426461
SHA256 (go/archivers_nfpm/nfpm-v2.15.1/v2.15.1.mod) = 8891343c0b6550b708611a75a9dbadb0fb2d3d1dacfdf52e55503a5c299cc923
SIZE (go/archivers_nfpm/nfpm-v2.15.1/v2.15.1.mod) = 3134
SHA256 (go/archivers_nfpm/nfpm-v2.15.1/v2.15.1.zip) = 6f972453af38ded9874a25528c2035c96d2d1ca6635eac066da9566f32f55cce
SIZE (go/archivers_nfpm/nfpm-v2.15.1/v2.15.1.zip) = 509469
28 changes: 10 additions & 18 deletions archivers/ocaml-zip/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Created by: Stanislav Sedov <[email protected]>

PORTNAME= zip
PORTVERSION= 1.06
PORTVERSION= 1.11
CATEGORIES= archivers
MASTER_SITES= https://download.ocamlcore.org/camlzip/camlzip/${PORTVERSION}/
PKGNAMEPREFIX= ocaml-
DISTNAME= caml${PORTNAME}-${PORTVERSION}

Expand All @@ -13,26 +12,19 @@ COMMENT= OCaml library to manipulate ZIP/GZIP/JAR archives
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE

USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= xavierleroy
GH_PROJECT= camlzip
GH_TAGNAME= rel${PORTVERSION:S/.//}

USE_OCAML= yes
USE_OCAML_FINDLIB=yes
USE_OCAML_LDCONFIG=yes
USE_OCAML_WASH= yes

ALL_TARGET= all allopt
INSTALL_TARGET= install installopt
PATTERN= ([[:space:]]*)cp([[:space:]]+.*)

post-extract:
# PREFIX, CFLAGS and permissions safeness
@${REINPLACE_CMD} -E \
-e "s,${PATTERN},\1\$${BSD_INSTALL_DATA}\2," \
-e "s,(-ccopt[[:space:]])-g,\1\"${CFLAGS}\"," \
-e "s,^(INSTALLDIR=).*,\1${STAGEDIR}${OCAMLFIND_DESTDIR}/zip," \
-e "/ldconf/d" ${WRKSRC}/Makefile

post-install:
${INSTALL_DATA} ${FILESDIR}/META ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME}
@${FIND} ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/zip/dllcamlzip.so
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/zip/zip.cmxs \
${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/zip/dllcamlzip.so

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions archivers/ocaml-zip/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1559737560
SHA256 (camlzip-1.06.tar.gz) = c83877f9972943e6f2e147cf9715a785da2fc8531e7bed3ab4787043b8f4cf54
SIZE (camlzip-1.06.tar.gz) = 26499
TIMESTAMP = 1607797813
SHA256 (xavierleroy-camlzip-1.11-rel111_GH0.tar.gz) = ffbbc5de3e1c13dc0e59272376d232d2ede91b327551063d47fddb74f1d5ed37
SIZE (xavierleroy-camlzip-1.11-rel111_GH0.tar.gz) = 28483
7 changes: 0 additions & 7 deletions archivers/ocaml-zip/files/META
View file

This file was deleted.

18 changes: 9 additions & 9 deletions archivers/ocaml-zip/files/patch-Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- Makefile.orig 2015-10-01 02:48:15 UTC
--- Makefile.orig 2020-12-12 18:30:13 UTC
+++ Makefile
@@ -56,7 +56,7 @@ clean:
@@ -64,7 +64,7 @@ libcamlzip$(EXT_LIB): $(C_OBJS)
.ml.cmx:
$(OCAMLOPT) -c $<
.c.o:
- $(OCAMLC) -c -ccopt -g $(ZLIB_I_OPT) $<
+ $(OCAMLC) -c -ccopt "$(CFLAGS)" $(ZLIB_I_OPT) $<

install:
mkdir -p $(INSTALLDIR)
- ${BSD_INSTALL_DATA} zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
+ ${BSD_INSTALL_DATA} zip.cma zip.cmi gzip.cmi zip.mli gzip.mli zlib.cmi zlib.mli libcamlzip.a $(INSTALLDIR)
if test -f dllcamlzip.so; then \
${BSD_INSTALL_DATA} dllcamlzip.so $(INSTALLDIR); \
installdir=$(INSTALLDIR); \
clean:
rm -f *.cm*
2 changes: 1 addition & 1 deletion archivers/ocaml-zip/pkg-descr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ This Objective Caml library provides easy access to compressed files in ZIP
and GZIP format, as well as to Java JAR files. It provides functions
for reading from and writing to compressed files in these formats.

WWW: http://pauillac.inria.fr/~xleroy/software.html
WWW: https://github.com/xavierleroy/camlzip
Loading

0 comments on commit b37fbe8

Please sign in to comment.