Attachment #220227 for bug #236362

Lines 1088-1093 Link Here

(-)b/sysutils/Makefile (+1 lines)
1088	SUBDIR += rhc	1088	SUBDIR += rhc
1089	SUBDIR += riak-cs	1089	SUBDIR += riak-cs
1090	SUBDIR += rinse	1090	SUBDIR += rinse
		1091	SUBDIR += rmlint
1091	SUBDIR += rocr	1092	SUBDIR += rocr
1092	SUBDIR += roct	1093	SUBDIR += roct
1093	SUBDIR += rovclock	1094	SUBDIR += rovclock




# $FreeBSD$

PORTNAME=	rmlint
DISTVERSIONPREFIX=	v
DISTVERSION=	2.9.0
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
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.pre.mk>

post-patch:
	${REINPLACE_CMD} -e 's|lseek64|lseek|g' ${WRKSRC}/lib/utilities.h

.include <bsd.port.post.mk>

Added Link Here

(-)b/sysutils/rmlint/distinfo (+3 lines)
1	TIMESTAMP = 1607016826
2	SHA256 (sahib-rmlint-v2.9.0_GH0.tar.gz) = a2d26863e0018efad60f0b1123e7cffd8ef764c8fb574a7987a49260e4e51c8f
3	SIZE (sahib-rmlint-v2.9.0_GH0.tar.gz) = 2483457




--- lib/xattr.c.orig	2019-08-20 20:40:07 UTC
+++ lib/xattr.c
@@ -207,7 +207,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);
 
@@ -283,7 +283,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);
 
@@ -310,6 +310,8 @@ int rm_xattr_clear_hash(RmFile *file, RmSession *sessi
 #endif
 }
 
+#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;
@@ -478,3 +480,5 @@ int rm_xattr_mark_deduplicated(const char *path, bool 
     g_hash_table_destroy(map);
     return result;
 }
+
+#endif

Added Link Here

(-)b/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

Added Link Here

(-)b/sysutils/rmlint/Makefile (+43 lines)
1	# $FreeBSD$
2
3	PORTNAME= rmlint
4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2.9.0
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	USE_GNOME= glib20
25
26	MAKE_ARGS= --actual-prefix=${PREFIX} \
27	--prefix=${STAGEDIR}${PREFIX} \
28	--without-gui
29
30	PLIST_FILES= bin/rmlint \
31	share/man/man1/rmlint.1.gz
32
33	OPTIONS_DEFINE= NLS
34
35	NLS_USES= gettext-runtime
36	NLS_CONFIGURE_WITH= gettext
37
38	.include <bsd.port.pre.mk>
39
40	post-patch:
41	${REINPLACE_CMD} -e 's\|lseek64\|lseek\|g' ${WRKSRC}/lib/utilities.h
42
43	.include <bsd.port.post.mk>

Added Link Here

(-)b/sysutils/rmlint/files/patch-lib_xattr.c (+44 lines)
1	--- lib/xattr.c.orig 2019-08-20 20:40:07 UTC
2	+++ lib/xattr.c
3	@@ -207,7 +207,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	@@ -283,7 +283,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	@@ -310,6 +310,8 @@ int rm_xattr_clear_hash(RmFile file, RmSession sessi
31	#endif
32	}
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	@@ -478,3 +480,5 @@ int rm_xattr_mark_deduplicated(const char *path, bool
40	g_hash_table_destroy(map);
41	return result;
42	}
43	+
44	+#endif