Attachment #222304 for bug #236362

Lines 1091-1096 Link Here

(-)sysutils/Makefile (+1 lines)
1091	SUBDIR += rhc	1091	SUBDIR += rhc
1092	SUBDIR += riak-cs	1092	SUBDIR += riak-cs
1093	SUBDIR += rinse	1093	SUBDIR += rinse
		1094	SUBDIR += rmlint
1094	SUBDIR += rocr	1095	SUBDIR += rocr
1095	SUBDIR += roct	1096	SUBDIR += roct
1096	SUBDIR += rovclock	1097	SUBDIR += rovclock




# $FreeBSD$

PORTNAME=	rmlint
DISTVERSIONPREFIX=	v
DISTVERSION=	2.10.1
CATEGORIES=	sysutils

MAINTAINER=	jockl@pianojockl.org
COMMENT=	Remove duplicates and other lint from your filesystem

LICENSE=	GPLv3

BUILD_DEPENDS=	${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \
		gettext:devel/gettext \
		pkgconf:devel/pkgconf \
		sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
LIB_DEPENDS=	libelf.so:devel/libelf \
		libjson-glib-1.0.so:devel/json-glib

USES=		gnome python scons
USE_GITHUB=	yes
GH_ACCOUNT=	sahib
GH_PROJECT=	rmlint
GH_TAGNAME=	a726d0cbf839d7a0f35962d67e0f60054d0364f6
USE_GNOME=	glib20

MAKE_ARGS=	--actual-prefix=${PREFIX} \
		--prefix=${STAGEDIR}${PREFIX} \
		--without-gui

PLIST_FILES=	bin/rmlint \
		share/man/man1/rmlint.1.gz

OPTIONS_DEFINE=	NLS

NLS_USES=		gettext-runtime
NLS_CONFIGURE_WITH=	gettext

.include <bsd.port.mk>

Line 0 Link Here

(-)sysutils/rmlint/distinfo (+3 lines)
	1	TIMESTAMP = 1612880853
	2	SHA256 (sahib-rmlint-v2.10.1-a726d0cbf839d7a0f35962d67e0f60054d0364f6_GH0.tar.gz) = ac564a89b5e6cc389c41bf1bf88b82c317373ad4b8c420cbe7416a8dd1fe6799
	3	SIZE (sahib-rmlint-v2.10.1-a726d0cbf839d7a0f35962d67e0f60054d0364f6_GH0.tar.gz) = 2495749




--- lib/utilities.h.orig	2020-12-06 15:39:50 UTC
+++ lib/utilities.h
@@ -127,6 +127,10 @@ static inline void rm_sys_close(int fd) {
     }
 }
 
+#ifndef HAVE_LSEEK64
+#define lseek64 lseek
+#endif
+
 static inline gint64 rm_sys_preadv(int fd, const struct iovec *iov, int iovcnt,
                                    RmOff offset) {
 #if RM_IS_APPLE || RM_IS_CYGWIN




--- lib/xattr.c.orig	2020-12-06 15:39:50 UTC
+++ lib/xattr.c
@@ -209,7 +209,7 @@ static int rm_xattr_del(RmFile *file, const char *key,
 //  ACTUAL API FUNCTIONS  //
 ////////////////////////////
 
-int rm_xattr_write_hash(RmFile *file, RmSession *session) {
+int rm_xattr_write_hash(__attribute__((unused)) RmFile *file, __attribute__((unused)) RmSession *session) {
     g_assert(file);
     g_assert(file->digest);
     g_assert(session);
@@ -236,7 +236,7 @@ int rm_xattr_write_hash(RmFile *file, RmSession *sessi
     return 0;
 }
 
-gboolean rm_xattr_read_hash(RmFile *file, RmSession *session) {
+gboolean rm_xattr_read_hash(__attribute__((unused)) RmFile *file, __attribute__((unused)) RmSession *session) {
     g_assert(file);
     g_assert(session);
 
@@ -287,7 +287,7 @@ gboolean rm_xattr_read_hash(RmFile *file, RmSession *s
 #endif
 }
 
-int rm_xattr_clear_hash(RmFile *file, RmSession *session) {
+int rm_xattr_clear_hash(__attribute__((unused)) RmFile *file, __attribute__((unused)) RmSession *session) {
     g_assert(file);
     g_assert(session);
 
@@ -316,6 +316,8 @@ int rm_xattr_clear_hash(RmFile *file, RmSession *sessi
 
 #if HAVE_XATTR
 
+#if HAVE_XATTR
+
 GHashTable *rm_xattr_list(const char *path, bool follow_symlinks) {
     const size_t buf_size = 4096;
     const size_t val_size = 1024;
@@ -484,5 +486,7 @@ int rm_xattr_mark_deduplicated(const char *path, bool 
     g_hash_table_destroy(map);
     return result;
 }
+
+#endif
 
 #endif

Line 0 Link Here

(-)sysutils/rmlint/pkg-descr (+5 lines)
	1	rmlint is an "extremely fast tool to remove duplicates and other lint
	2	from your filesystem."
	3
	4	WWW: https://rmlint.rtfd.org/
	5	WWW: https://github.com/sahib/rmlint

Return to bug 236362

Line 0 Link Here

(-)sysutils/rmlint/Makefile (+39 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= rmlint
	4	DISTVERSIONPREFIX= v
	5	DISTVERSION= 2.10.1
	6	CATEGORIES= sysutils
	7
	8	MAINTAINER= jockl@pianojockl.org
	9	COMMENT= Remove duplicates and other lint from your filesystem
	10
	11	LICENSE= GPLv3
	12
	13	BUILD_DEPENDS= ${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \
	14	gettext:devel/gettext \
	15	pkgconf:devel/pkgconf \
	16	sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
	17	LIB_DEPENDS= libelf.so:devel/libelf \
	18	libjson-glib-1.0.so:devel/json-glib
	19
	20	USES= gnome python scons
	21	USE_GITHUB= yes
	22	GH_ACCOUNT= sahib
	23	GH_PROJECT= rmlint
	24	GH_TAGNAME= a726d0cbf839d7a0f35962d67e0f60054d0364f6
	25	USE_GNOME= glib20
	26
	27	MAKE_ARGS= --actual-prefix=${PREFIX} \
	28	--prefix=${STAGEDIR}${PREFIX} \
	29	--without-gui
	30
	31	PLIST_FILES= bin/rmlint \
	32	share/man/man1/rmlint.1.gz
	33
	34	OPTIONS_DEFINE= NLS
	35
	36	NLS_USES= gettext-runtime
	37	NLS_CONFIGURE_WITH= gettext
	38
	39	.include <bsd.port.mk>

Line 0 Link Here

(-)sysutils/rmlint/files/patch-lib_utilities.h (+13 lines)
	1	--- lib/utilities.h.orig 2020-12-06 15:39:50 UTC
	2	+++ lib/utilities.h
	3	@@ -127,6 +127,10 @@ static inline void rm_sys_close(int fd) {
	4	}
	5	}
	6
	7	+#ifndef HAVE_LSEEK64
	8	+#define lseek64 lseek
	9	+#endif
	10	+
	11	static inline gint64 rm_sys_preadv(int fd, const struct iovec *iov, int iovcnt,
	12	RmOff offset) {
	13	#if RM_IS_APPLE \|\| RM_IS_CYGWIN

Line 0 Link Here

(-)sysutils/rmlint/files/patch-lib_xattr.c (+46 lines)
	1	--- lib/xattr.c.orig 2020-12-06 15:39:50 UTC
	2	+++ lib/xattr.c
	3	@@ -209,7 +209,7 @@ static int rm_xattr_del(RmFile file, const char key,
	4	// ACTUAL API FUNCTIONS //
	5	////////////////////////////
	6
	7	-int rm_xattr_write_hash(RmFile file, RmSession session) {
	8	+int rm_xattr_write_hash(__attribute__((unused)) RmFile file, __attribute__((unused)) RmSession session) {
	9	g_assert(file);
	10	g_assert(file->digest);
	11	g_assert(session);
	12	@@ -236,7 +236,7 @@ int rm_xattr_write_hash(RmFile file, RmSession sessi
	13	return 0;
	14	}
	15
	16	-gboolean rm_xattr_read_hash(RmFile file, RmSession session) {
	17	+gboolean rm_xattr_read_hash(__attribute__((unused)) RmFile file, __attribute__((unused)) RmSession session) {
	18	g_assert(file);
	19	g_assert(session);
	20
	21	@@ -287,7 +287,7 @@ gboolean rm_xattr_read_hash(RmFile file, RmSession s
	22	#endif
	23	}
	24
	25	-int rm_xattr_clear_hash(RmFile file, RmSession session) {
	26	+int rm_xattr_clear_hash(__attribute__((unused)) RmFile file, __attribute__((unused)) RmSession session) {
	27	g_assert(file);
	28	g_assert(session);
	29
	30	@@ -316,6 +316,8 @@ int rm_xattr_clear_hash(RmFile file, RmSession sessi
	31
	32	#if HAVE_XATTR
	33
	34	+#if HAVE_XATTR
	35	+
	36	GHashTable rm_xattr_list(const char path, bool follow_symlinks) {
	37	const size_t buf_size = 4096;
	38	const size_t val_size = 1024;
	39	@@ -484,5 +486,7 @@ int rm_xattr_mark_deduplicated(const char *path, bool
	40	g_hash_table_destroy(map);
	41	return result;
	42	}
	43	+
	44	+#endif
	45
	46	#endif