CVS commit: pkgsrc/archivers/libarchive

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 24 23:01:26 UTC 2024

Modified Files:
        pkgsrc/archivers/libarchive: Makefile builtin.mk

Log Message:
libarchive: build without iconv; fix some pkglint warnings


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/archivers/libarchive/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/libarchive/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/Makefile
diff -u pkgsrc/archivers/libarchive/Makefile:1.52 pkgsrc/archivers/libarchive/Makefile:1.53
--- pkgsrc/archivers/libarchive/Makefile:1.52   Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/Makefile        Wed Jan 24 23:01:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2024/01/18 18:00:11 adam Exp $
+# $NetBSD: Makefile,v 1.53 2024/01/24 23:01:26 adam Exp $
 
 .include "Makefile.common"
 
@@ -9,6 +9,7 @@ CONFIGURE_ARGS+=        --disable-bsdcat
 CONFIGURE_ARGS+=       --disable-bsdcpio
 CONFIGURE_ARGS+=       --disable-bsdtar
 CONFIGURE_ARGS+=       --disable-bsdunzip
+CONFIGURE_ARGS+=       --without-iconv
 
 do-extract:
        ${CP} -R ${FILESDIR} ${WRKSRC}

Index: pkgsrc/archivers/libarchive/builtin.mk
diff -u pkgsrc/archivers/libarchive/builtin.mk:1.13 pkgsrc/archivers/libarchive/builtin.mk:1.14
--- pkgsrc/archivers/libarchive/builtin.mk:1.13 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/builtin.mk      Wed Jan 24 23:01:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2024/01/18 18:00:11 adam Exp $
+# $NetBSD: builtin.mk,v 1.14 2024/01/24 23:01:26 adam Exp $
 
 BUILTIN_PKG:=  libarchive
 
@@ -105,7 +105,7 @@ _LIBARCHIVE_LIBS=   -llzma -lbz2 -lz
 fake-libarchive-pc:
        ${RUN}  \
        sedsrc=../../archivers/libarchive/files/build/pkgconfig/libarchive.pc.in;       \
-       src=${BUILDLINK_PREFIX.libarchive:Q}/lib${LIBABISUFFIX}/pkgconfig/libarchive.pc;\
+       src=${BUILDLINK_PREFIX.libarchive}/lib${LIBABISUFFIX}/pkgconfig/libarchive.pc;  \
        dst=${_FAKE_LIBARCHIVE_PC};                                                     \
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig;                                        \
        if [ ! -f $${dst} ]; then                                                       \
@@ -114,10 +114,10 @@ fake-libarchive-pc:
                        ${LN} -sf $${src} $${dst};                                      \
                else                                                                    \
                        ${ECHO_BUILDLINK_MSG} "Creating $${dst}";                       \
-                       ${SED}  -e s,@prefix@,${BUILDLINK_PREFIX.libarchive:Q},         \
-                                       -e s,@exec_prefix@,${BUILDLINK_PREFIX.libarchive:Q},\
-                                       -e s,@libdir@,${BUILDLINK_PREFIX.libarchive:Q}/lib${LIBABISUFFIX},\
-                                       -e s,@includedir@,${BUILDLINK_PREFIX.libarchive:Q}/include,\
+                       ${SED}  -e s,@prefix@,${BUILDLINK_PREFIX.libarchive},           \
+                                       -e s,@exec_prefix@,${BUILDLINK_PREFIX.libarchive},\
+                                       -e s,@libdir@,${BUILDLINK_PREFIX.libarchive}/lib${LIBABISUFFIX},\
+                                       -e s,@includedir@,${BUILDLINK_PREFIX.libarchive}/include,\
                                        -e s,@VERSION@,${BUILTIN_VERSION.libarchive},   \
                                        -e s,@LIBS@,${_LIBARCHIVE_LIBS:Q},              \
                                $${sedsrc} > $${dst};                                   \