mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Enforce libarchive from ports
This reduces the patching level on some ports and make it simpler to maintainer over all supported version of freebsd
This commit is contained in:
Baptiste Daroussin
parent
e7c8f62257
commit
cd6ed67653
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=392537
12 changed files with 19 additions and 129 deletions
|
|
@ -24,7 +24,7 @@ RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \
|
|||
libgda5-postgresql>=0:${PORTSDIR}/databases/libgda5-postgresql
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USES= desktop-file-utils gettext gmake libtool pathfix \
|
||||
USES= desktop-file-utils gettext gmake libarchive libtool pathfix \
|
||||
pgsql pkgconfig python shared-mime-info tar:xz
|
||||
WANT_PGSQL= server
|
||||
USE_GNOME= gnomedocutils gnomeprefix intlhack pygobject3 libxml2 \
|
||||
|
|
@ -42,10 +42,6 @@ INSTALLS_ICONS= yes
|
|||
#PLIST_SUB+= VERSION=${PORTVERSION:R}
|
||||
PLIST_SUB+= VERSION=1.26
|
||||
|
||||
.if ! exists(/usr/libdata/pkgconfig/libarchive.pc)
|
||||
LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \
|
||||
${WRKSRC}/Makefile.in
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= cmake
|
||||
PORTVERSION= 3.2.3
|
||||
PORTREVISION?= 1
|
||||
PORTREVISION?= 2
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= http://www.cmake.org/files/v3.2/
|
||||
|
||||
|
|
@ -25,6 +25,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
|
|||
OPTIONS_DEFINE= DOCS MANPAGES
|
||||
OPTIONS_DEFAULT=MANPAGES
|
||||
OPTIONS_SUB= yes
|
||||
USES+= libarchive
|
||||
HAS_CONFIGURE= yes
|
||||
|
||||
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
|
||||
|
|
@ -42,14 +43,6 @@ MANPAGES_CONFIGURE_ON= --sphinx-man
|
|||
INSTALL_TARGET= install/strip
|
||||
.endif
|
||||
|
||||
.if !defined(CMAKE_MODULES)
|
||||
# CMake >= 3.1.0 needs libarchive3 because it calls
|
||||
# archive_entry_copy_sourcepath_w and archive_write_set_format_7zip.
|
||||
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000009
|
||||
LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive
|
||||
.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1000009
|
||||
.endif # !defined(CMAKE_MODULES)
|
||||
|
||||
post-patch:
|
||||
@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
|
||||
${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
PORTNAME= gvfs
|
||||
PORTVERSION= 1.20.3
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= devel gnome
|
||||
MASTER_SITES= GNOME
|
||||
DIST_SUBDIR= gnome3
|
||||
|
|
@ -20,7 +20,7 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
|
|||
|
||||
PORTSCOUT= limitw:1,even
|
||||
|
||||
USES= gettext gmake libtool pathfix pkgconfig tar:xz
|
||||
USES= gettext gmake libarchive libtool pathfix pkgconfig tar:xz
|
||||
USE_GNOME= glib20 gnomeprefix intlhack intltool libxslt:build
|
||||
GNU_CONFIGURE= yes
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
|
|
@ -69,10 +69,6 @@ AVAHI_CONFIGURE_ENABLE= avahi
|
|||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${OSVERSION} < 1000000
|
||||
LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MSAMBA}
|
||||
GLIB_SCHEMAS+= org.gnome.system.smb.gschema.xml
|
||||
.endif
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= libtifiles2
|
||||
PORTVERSION= 1.1.6
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= SF/tilp/tilp2-linux/tilp2-1.17
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ LIB_DEPENDS= libticonv.so:${PORTSDIR}/converters/libticonv
|
|||
|
||||
USE_GNOME= glib20
|
||||
USE_LDCONFIG= yes
|
||||
USES= gmake libtool pathfix pkgconfig tar:bzip2
|
||||
USES= gmake libarchive libtool pathfix pkgconfig tar:bzip2
|
||||
|
||||
OPTIONS_DEFINE= NLS
|
||||
OPTIONS_SUB= yes
|
||||
|
|
@ -24,12 +24,5 @@ NLS_USES= gettext
|
|||
NLS_CONFIGURE_ENABLE= nls
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ENV= ARCHIVE_CFLAGS=" " ARCHIVE_LIBS="-larchive"
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's/libarchive/glib-2.0,ticonv/' \
|
||||
-e '/Requires:/d' ${WRKSRC}/tifiles2.pc.in
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -16,12 +16,11 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
|
|||
libtiff.so:${PORTSDIR}/graphics/tiff \
|
||||
liblcms2.so:${PORTSDIR}/graphics/lcms2
|
||||
|
||||
USES= gettext gmake jpeg libtool pathfix pkgconfig tar:xz
|
||||
USES= gettext gmake jpeg libtool libarchive pathfix pkgconfig tar:xz
|
||||
USE_LDCONFIG= yes
|
||||
USE_GNOME= cairo gnomeprefix glib20 intlhack
|
||||
GNU_CONFIGURE= yes
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib -larchive
|
||||
MAKE_ARGS+= V=1
|
||||
CONFIGURE_ARGS+= --enable-introspection=no
|
||||
INSTALL_TARGET= install-strip
|
||||
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
--- configure.orig 2014-03-24 09:05:21.575540501 +0000
|
||||
+++ configure 2014-03-24 09:05:37.706538416 +0000
|
||||
@@ -13236,13 +13236,11 @@
|
||||
gobject-2.0 >= \$GLIB_REQUIRED
|
||||
gio-2.0 >= \$GLIB_REQUIRED
|
||||
cairo >= \$CAIRO_REQUIRED
|
||||
- libarchive >= \$LIBARCHIVE_REQUIRED
|
||||
freetype2\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
|
||||
gobject-2.0 >= $GLIB_REQUIRED
|
||||
gio-2.0 >= $GLIB_REQUIRED
|
||||
cairo >= $CAIRO_REQUIRED
|
||||
- libarchive >= $LIBARCHIVE_REQUIRED
|
||||
freetype2") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
@@ -13251,7 +13249,6 @@
|
||||
gobject-2.0 >= $GLIB_REQUIRED
|
||||
gio-2.0 >= $GLIB_REQUIRED
|
||||
cairo >= $CAIRO_REQUIRED
|
||||
- libarchive >= $LIBARCHIVE_REQUIRED
|
||||
freetype2" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
@@ -13268,13 +13265,11 @@
|
||||
gobject-2.0 >= \$GLIB_REQUIRED
|
||||
gio-2.0 >= \$GLIB_REQUIRED
|
||||
cairo >= \$CAIRO_REQUIRED
|
||||
- libarchive >= \$LIBARCHIVE_REQUIRED
|
||||
freetype2\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
|
||||
gobject-2.0 >= $GLIB_REQUIRED
|
||||
gio-2.0 >= $GLIB_REQUIRED
|
||||
cairo >= $CAIRO_REQUIRED
|
||||
- libarchive >= $LIBARCHIVE_REQUIRED
|
||||
freetype2") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
@@ -13283,7 +13278,6 @@
|
||||
gobject-2.0 >= $GLIB_REQUIRED
|
||||
gio-2.0 >= $GLIB_REQUIRED
|
||||
cairo >= $CAIRO_REQUIRED
|
||||
- libarchive >= $LIBARCHIVE_REQUIRED
|
||||
freetype2" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
@@ -13309,14 +13303,12 @@
|
||||
gobject-2.0 >= $GLIB_REQUIRED
|
||||
gio-2.0 >= $GLIB_REQUIRED
|
||||
cairo >= $CAIRO_REQUIRED
|
||||
- libarchive >= $LIBARCHIVE_REQUIRED
|
||||
freetype2" 2>&1`
|
||||
else
|
||||
GXPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED
|
||||
gobject-2.0 >= $GLIB_REQUIRED
|
||||
gio-2.0 >= $GLIB_REQUIRED
|
||||
cairo >= $CAIRO_REQUIRED
|
||||
- libarchive >= $LIBARCHIVE_REQUIRED
|
||||
freetype2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
@@ -13326,7 +13318,6 @@
|
||||
gobject-2.0 >= $GLIB_REQUIRED
|
||||
gio-2.0 >= $GLIB_REQUIRED
|
||||
cairo >= $CAIRO_REQUIRED
|
||||
- libarchive >= $LIBARCHIVE_REQUIRED
|
||||
freetype2) were not met:
|
||||
|
||||
$GXPS_PKG_ERRORS
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- libgxps.pc.in.orig 2010-09-05 12:21:14.000000000 +0200
|
||||
+++ libgxps.pc.in 2014-03-25 17:14:35.000000000 +0100
|
||||
@@ -6,6 +6,6 @@
|
||||
Name: libgxps
|
||||
Description: XPS Documents library
|
||||
Version: @VERSION@
|
||||
-Requires: gio-2.0 >= @GLIB_REQUIRED@ libarchive >= @LIBARCHIVE_REQUIRED@ cairo >= @CAIRO_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@
|
||||
-Libs: -L${libdir} -lgxps
|
||||
+Requires: gio-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@
|
||||
+Libs: -L${libdir} -lgxps -larchive
|
||||
Cflags: -I${includedir}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= zathura-cb
|
||||
PORTVERSION= 0.1.4
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= http://pwmt.org/projects/zathura-cb/download/
|
||||
|
||||
|
|
@ -14,13 +14,12 @@ LICENSE_NAME= zlib license
|
|||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
|
||||
|
||||
LIB_DEPENDS= libarchive.so:${PORTSDIR}/archivers/libarchive
|
||||
BUILD_DEPENDS= zathura:${PORTSDIR}/graphics/zathura
|
||||
RUN_DEPENDS= zathura:${PORTSDIR}/graphics/zathura
|
||||
|
||||
PLIST_FILES= lib/zathura/cb.so share/applications/zathura-cb.desktop
|
||||
|
||||
USES= desktop-file-utils gmake pkgconfig
|
||||
USES= desktop-file-utils gmake pkgconfig libarchive
|
||||
USE_GNOME= glib20 gtk30
|
||||
USE_OPENSSL= yes
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
PORTNAME= totem-pl-parser
|
||||
PORTVERSION= 3.10.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= multimedia gnome
|
||||
MASTER_SITES= GNOME
|
||||
DIST_SUBDIR= gnome2
|
||||
|
|
@ -14,16 +15,12 @@ COMMENT= GObject-based library to parse a host of playlist formats
|
|||
LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
|
||||
libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
|
||||
|
||||
USES= gettext gmake libtool pathfix pkgconfig tar:xz
|
||||
USES= gettext gmake libarchive libtool pathfix pkgconfig tar:xz
|
||||
USE_GNOME= glib20 gnomeprefix intlhack introspection:build \
|
||||
libxml2
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --enable-libarchive
|
||||
CONFIGURE_ENV= ARCHIVE_CFLAGS="-I/usr/include" \
|
||||
ARCHIVE_LIBS="-L/usr/lib -larchive"
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LIBS+= -L${LOCALBASE}/lib
|
||||
INSTALL_TARGET= install-strip
|
||||
|
||||
OPTIONS_SUB= yes
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= archivemount
|
||||
PORTVERSION= 0.6.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://www.cybernoia.de/software/archivemount/
|
||||
|
||||
|
|
@ -10,7 +11,7 @@ MAINTAINER= jirnov@gmail.com
|
|||
COMMENT= Mount archives with FUSE
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USES= fuse pkgconfig iconv gmake
|
||||
USES= fuse pkgconfig iconv gmake libarchive
|
||||
|
||||
PLIST_FILES= bin/archivemount \
|
||||
man/man1/archivemount.1.gz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= rdup
|
||||
PORTVERSION= 1.1.14
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://archive.miek.nl/projects/rdup/
|
||||
|
||||
|
|
@ -14,13 +14,10 @@ LICENSE= GPLv3
|
|||
|
||||
LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20 \
|
||||
libpcre.so:${PORTSDIR}/devel/pcre \
|
||||
libarchive.so:${PORTSDIR}/archivers/libarchive \
|
||||
libnettle.so:${PORTSDIR}/security/nettle
|
||||
|
||||
USES= gmake pkgconfig tar:bzip2
|
||||
USES= gmake libarchive pkgconfig tar:bzip2
|
||||
USE_AUTOTOOLS= autoconf
|
||||
MAKEFILE= GNUmakefile
|
||||
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
PORTNAME= tracker
|
||||
PORTVERSION= 1.2.6
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= sysutils gnome
|
||||
MASTER_SITES= GNOME
|
||||
|
||||
|
|
@ -26,14 +26,13 @@ RUN_DEPENDS= xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
|
|||
|
||||
PLIST_SUB= TRACKER_VER="1.0"
|
||||
|
||||
USES= gettext gmake libtool pathfix pkgconfig tar:xz
|
||||
USES= gettext gmake libarchive libtool pathfix pkgconfig tar:xz
|
||||
USE_GNOME= gnomeprefix gtk30 intlhack introspection:build
|
||||
USE_LDCONFIG= yes
|
||||
USE_SQLITE= 3
|
||||
USE_GSTREAMER1= yes
|
||||
GNU_CONFIGURE= yes
|
||||
INSTALLS_ICONS= yes
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker
|
||||
CONFIGURE_ARGS= --enable-video-extractor=gstreamer \
|
||||
--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue