pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/c-icap
Module Name: pkgsrc
Committed By: nia
Date: Sun Jul 9 09:50:48 UTC 2023
Modified Files:
pkgsrc/www/c-icap: Makefile PLIST buildlink3.mk distinfo options.mk
Added Files:
pkgsrc/www/c-icap/patches: patch-modules_memcached.c
Log Message:
c-icap: Improve dependency handling.
Should help the build (including that of dependent packages) on a variety
of platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/c-icap/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/c-icap/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/c-icap/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/c-icap/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/c-icap/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/c-icap/patches/patch-modules_memcached.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/c-icap/Makefile
diff -u pkgsrc/www/c-icap/Makefile:1.32 pkgsrc/www/c-icap/Makefile:1.33
--- pkgsrc/www/c-icap/Makefile:1.32 Thu Jul 6 09:42:18 2023
+++ pkgsrc/www/c-icap/Makefile Sun Jul 9 09:50:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2023/07/06 09:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2023/07/09 09:50:47 nia Exp $
DISTNAME= c_icap-0.5.5
PKGNAME= ${DISTNAME:S/_/-/}
@@ -30,14 +30,7 @@ SUBST_FILES.fix-path= c-icap.conf.in
SUBST_SED.fix-path= -e 's, @prefix@/var, ${VARBASE},g'
SUBST_SED.fix-path+= -e 's, /var, ${VARBASE},g'
-SUBST_CLASSES+= fix-ldap
-SUBST_STAGE.fix-ldap= post-configure
-SUBST_MESSAGE.fix-ldap= Fixing LDAP.
-SUBST_FILES.fix-ldap= modules/Makefile
-SUBST_SED.fix-ldap= -e 's,-DLDAP_DEPRECATED,,g'
-
.include "options.mk"
-.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/c-icap/PLIST
diff -u pkgsrc/www/c-icap/PLIST:1.5 pkgsrc/www/c-icap/PLIST:1.6
--- pkgsrc/www/c-icap/PLIST:1.5 Thu Oct 3 16:34:59 2019
+++ pkgsrc/www/c-icap/PLIST Sun Jul 9 09:50:47 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/10/03 16:34:59 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/07/09 09:50:47 nia Exp $
bin/c-icap
bin/c-icap-client
bin/c-icap-config
@@ -44,6 +44,7 @@ include/c_icap/util.h
${PLIST.bdb}lib/c_icap/bdb_tables.la
lib/c_icap/dnsbl_tables.la
${PLIST.ldap}lib/c_icap/ldap_module.la
+${PLIST.memcached}lib/c_icap/memcached_cache.la
${PLIST.perl}lib/c_icap/perl_handler.la
lib/c_icap/shared_cache.la
lib/c_icap/srv_echo.la
Index: pkgsrc/www/c-icap/buildlink3.mk
diff -u pkgsrc/www/c-icap/buildlink3.mk:1.3 pkgsrc/www/c-icap/buildlink3.mk:1.4
--- pkgsrc/www/c-icap/buildlink3.mk:1.3 Tue Jun 28 11:37:02 2022
+++ pkgsrc/www/c-icap/buildlink3.mk Sun Jul 9 09:50:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/06/28 11:37:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/07/09 09:50:47 nia Exp $
BUILDLINK_TREE+= c-icap
@@ -9,7 +9,25 @@ BUILDLINK_API_DEPENDS.c-icap+= c-icap>=0
BUILDLINK_ABI_DEPENDS.c-icap?= c-icap>=0.5.5nb4
BUILDLINK_PKGSRCDIR.c-icap?= ../../www/c-icap
-.include "../../devel/zlib/buildlink3.mk"
+pkgbase:= c-icap
+
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.c-icap:Mbrotli}
+. include "../../archivers/brotli/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.c-icap:Mbzip2}
+. include "../../archivers/bzip2/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.c-icap:Mopenssl}
+. include "../../security/openssl/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.c-icap:Mzlib}
+. include "../../devel/zlib/buildlink3.mk"
+.endif
.endif # C_ICAP_BUILDLINK3_MK
BUILDLINK_TREE+= -c-icap
Index: pkgsrc/www/c-icap/distinfo
diff -u pkgsrc/www/c-icap/distinfo:1.16 pkgsrc/www/c-icap/distinfo:1.17
--- pkgsrc/www/c-icap/distinfo:1.16 Tue Oct 26 11:29:22 2021
+++ pkgsrc/www/c-icap/distinfo Sun Jul 9 09:50:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 11:29:22 nia Exp $
+$NetBSD: distinfo,v 1.17 2023/07/09 09:50:47 nia Exp $
BLAKE2s (c_icap-0.5.5.tar.gz) = 7e3d4b6abddfc2b93670f72e0a4f32923d73b9dc9a1b3ac431d522ba6a9c04f0
SHA512 (c_icap-0.5.5.tar.gz) = 7a24c90116df40c5a8dc29785efacba65f16557f44f6b26de7bb1bb4890e8bf017db582ccac7d82a1be4efe41d3a7f420ad27c3f012d9c1741c3fd69abd9e571
@@ -6,4 +6,5 @@ Size (c_icap-0.5.5.tar.gz) = 690954 byte
SHA1 (patch-Makefile.in) = e8f3b47030f06051f392d4c343bc0c3f523320cc
SHA1 (patch-cfg__param.c) = e25b0c8145e7bbe6eddc1f8eafbd2fa5304fdda6
SHA1 (patch-configure) = d2e08b9717d6566b6f66f18abcc9bc0dd5098df5
+SHA1 (patch-modules_memcached.c) = f3967aa445007591b3ed5bc8ac7b098fb250f1da
SHA1 (patch-os_unix_shared_mem.c) = 2510558df7be6cdb6169b45b0271dc47fc463095
Index: pkgsrc/www/c-icap/options.mk
diff -u pkgsrc/www/c-icap/options.mk:1.1.1.1 pkgsrc/www/c-icap/options.mk:1.2
--- pkgsrc/www/c-icap/options.mk:1.1.1.1 Wed May 11 04:29:18 2011
+++ pkgsrc/www/c-icap/options.mk Sun Jul 9 09:50:47 2023
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/05/11 04:29:18 adam Exp $
+# $NetBSD: options.mk,v 1.2 2023/07/09 09:50:47 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.c-icap
-PKG_SUPPORTED_OPTIONS= bdb ldap perl
-PKG_SUGGESTED_OPTIONS= bdb ldap perl
+PKG_SUPPORTED_OPTIONS= bzip2 brotli bdb ldap memcached openssl perl pcre zlib
+PKG_SUGGESTED_OPTIONS= bdb ldap openssl perl zlib
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= bdb ldap perl
+PLIST_VARS+= bdb ldap memcached perl
.if !empty(PKG_OPTIONS:Mbdb)
PLIST.bdb= yes
@@ -17,14 +17,48 @@ CONFIGURE_ARGS+= --with-bdb=${BDBBASE}
CONFIGURE_ARGS+= --without-bdb
.endif
+.if !empty(PKG_OPTIONS:Mbrotli)
+CONFIGURE_ARGS+= --with-brotli
+. include "../../archivers/brotli/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-brotli
+.endif
+
+.if !empty(PKG_OPTIONS:Mbzip2)
+CONFIGURE_ARGS+= --with-bzlib
+. include "../../archivers/bzip2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-bzlib
+.endif
+
+.if !empty(PKG_OPTIONS:Mmemcached)
+PLIST.memcached= yes
+CONFIGURE_ARGS+= --with-memcached
+. include "../../devel/libmemcached/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-memcached
+.endif
+
.if !empty(PKG_OPTIONS:Mldap)
-PLIST.ldap= yes
CONFIGURE_ARGS+= --with-ldap
. include "../../databases/openldap-client/buildlink3.mk"
+SUBST_CLASSES+= fix-ldap
+SUBST_STAGE.fix-ldap= post-configure
+SUBST_MESSAGE.fix-ldap= Fixing LDAP.
+SUBST_FILES.fix-ldap= modules/Makefile
+SUBST_SED.fix-ldap= -e 's,-DLDAP_DEPRECATED,,g'
+PLIST.ldap= yes
.else
CONFIGURE_ARGS+= --without-ldap
.endif
+.if !empty(PKG_OPTIONS:Mopenssl)
+CONFIGURE_ARGS+= --with-openssl
+. include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-openssl
+.endif
+
.if !empty(PKG_OPTIONS:Mperl)
PLIST.perl= yes
USE_TOOLS+= perl:build
@@ -33,3 +67,17 @@ CONFIGURE_ARGS+= --with-perl
.else
CONFIGURE_ARGS+= --without-perl
.endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+CONFIGURE_ARGS+= --with-pcre
+. include "../../devel/pcre/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-pcre
+.endif
+
+.if !empty(PKG_OPTIONS:Mzlib)
+CONFIGURE_ARGS+= --with-zlib
+. include "../../devel/zlib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-zlib
+.endif
Added files:
Index: pkgsrc/www/c-icap/patches/patch-modules_memcached.c
diff -u /dev/null pkgsrc/www/c-icap/patches/patch-modules_memcached.c:1.1
--- /dev/null Sun Jul 9 09:50:48 2023
+++ pkgsrc/www/c-icap/patches/patch-modules_memcached.c Sun Jul 9 09:50:47 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_memcached.c,v 1.1 2023/07/09 09:50:47 nia Exp $
+
+Confusingly this header seems to both not exist and not be required.
+
+--- modules/memcached.c.orig 2017-10-21 06:57:48.000000000 +0000
++++ modules/memcached.c
+@@ -47,8 +47,6 @@
+ #include <libmemcached/memcached_pool.h>
+ #endif
+
+-#include <crypt.h>
+-
+ int USE_MD5_SUM_KEYS = 1;
+
+ int mc_cfg_servers_set(const char *directive, const char **argv, void *setdata);
Home |
Main Index |
Thread Index |
Old Index