Attachment #185535 for bug #221595

View | Details | Raw Unified | Return to bug 221595
Collapse All | Expand All




PORTNAME=	inotify-tools
PORTVERSION=	3.14.01
DISTVERSIONPREFIX=	v
PORTREVISION=	1
CATEGORIES=	sysutils

MAINTAINER=	yuri@rawbw.com
COMMENT=	Command-line utilities to watch for file events

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libinotify.so:devel/libinotify

USES=		autoreconf gmake libtool localbase
USE_GITHUB=	yes
GH_ACCOUNT=	rvoicilas
GH_TAGNAME=	1df9af4

USES=		autoreconf gmake libtool
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-doxygen
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	STATIC
OPTIONS_SUB=	yes

post-patch:
	@${REINPLACE_CMD} -e 's|stat64|stat|' \
		${WRKSRC}/src/common.c \
		${WRKSRC}/libinotifytools/src/inotifytools.c

post-build-STATIC-on:
	@cd ${WRKSRC}/src && \
		${CC} -pthread ${LDFLAGS} -static -o inotifywait.static inotifywait.o common.o ../libinotifytools/src/.libs/libinotifytools.a ${LOCALBASE}/lib/libinotify.a && \
		${CC} -pthread ${LDFLAGS} -static -o inotifywatch.static inotifywatch.o common.o ../libinotifytools/src/.libs/libinotifytools.a ${LOCALBASE}/lib/libinotify.a

post-install-STATIC-on:
	${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywait.static ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywatch.static ${STAGEDIR}${PREFIX}/bin

.include <bsd.port.mk>

Lines 8-18 Link Here

(-)sysutils/inotify-tools/files/patch-configure.ac (-8 lines)
8		8
9	# Checks for header files.	9	# Checks for header files.
10	AC_CHECK_HEADERS([sys/inotify.h mcheck.h])	10	AC_CHECK_HEADERS([sys/inotify.h mcheck.h])
11	@@ -62,6 +63,7 @@ AC_C_CONST
12	AC_C_INLINE
13
14	# Checks for library functions.
15	+AC_CHECK_FUNCS(stat64, [], [CPPFLAGS="$CPPFLAGS -Dstat64=stat -Dlstat64=lstat"])
16
17	# Set variables used in man page templates
18	MAN_DATE=$(date +'%B %d, %Y')




--- src/common.c.orig	2010-02-02 14:55:19 UTC
+++ src/common.c
@@ -41,9 +41,9 @@ void print_event_descriptions() {
 }
 
 int isdir( char const * path ) {
-	static struct stat64 my_stat;
+	static struct stat my_stat;
 
-	if ( -1 == lstat64( path, &my_stat ) ) {
+	if ( -1 == lstat( path, &my_stat ) ) {
 		if (errno == ENOENT) return 0;
 		fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
 		return 0;

Lines 1-5 Link Here

(-)sysutils/inotify-tools/pkg-plist (+2 lines)
1	bin/inotifywait	1	bin/inotifywait
2	bin/inotifywatch	2	bin/inotifywatch
		3	%%STATIC%%bin/inotifywait.static
		4	%%STATIC%%bin/inotifywatch.static
3	include/inotifytools/inotify-nosys.h	5	include/inotifytools/inotify-nosys.h
4	include/inotifytools/inotify.h	6	include/inotifytools/inotify.h
5	include/inotifytools/inotifytools.h	7	include/inotifytools/inotifytools.h

Return to bug 221595

Lines 4-29 Link Here

(-)sysutils/inotify-tools/Makefile (-5 / +20 lines)
4	PORTNAME= inotify-tools	4	PORTNAME= inotify-tools
5	PORTVERSION= 3.14.01	5	PORTVERSION= 3.14.01
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
		7	PORTREVISION= 1
7	CATEGORIES= sysutils	8	CATEGORIES= sysutils
8		9
9	MAINTAINER= yuri@rawbw.com	10	MAINTAINER= yuri@rawbw.com
10	COMMENT= Command-line utilities to watch for file events	11	COMMENT= Command-line utilities to watch for file events
11		12
12	LICENSE= AGPLv3	13	LICENSE= GPLv2
		14	LICENSE_FILE= ${WRKSRC}/COPYING
13		15
14	LIB_DEPENDS= libinotify.so:devel/libinotify	16	LIB_DEPENDS= libinotify.so:devel/libinotify
15		17
		18	USES= autoreconf gmake libtool localbase
16	USE_GITHUB= yes	19	USE_GITHUB= yes
17	GH_ACCOUNT= rvoicilas	20	GH_ACCOUNT= rvoicilas
18	GH_TAGNAME= 1df9af4	21	GH_TAGNAME= 1df9af4
19
20	USES= autoreconf gmake libtool
21	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --disable-doxygen	23	CONFIGURE_ARGS= --disable-doxygen
23	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
24	INSTALL_TARGET= install-strip	25	INSTALL_TARGET= install-strip
25		26
26	CPPFLAGS+= -I${LOCALBASE}/include	27	OPTIONS_DEFINE= STATIC
27	LDFLAGS+= -L${LOCALBASE}/lib	28	OPTIONS_SUB= yes
28		29
		30	post-patch:
		31	@${REINPLACE_CMD} -e 's\|stat64\|stat\|' \
		32	${WRKSRC}/src/common.c \
		33	${WRKSRC}/libinotifytools/src/inotifytools.c
		34
		35	post-build-STATIC-on:
		36	@cd ${WRKSRC}/src && \
		37	${CC} -pthread ${LDFLAGS} -static -o inotifywait.static inotifywait.o common.o ../libinotifytools/src/.libs/libinotifytools.a ${LOCALBASE}/lib/libinotify.a && \
		38	${CC} -pthread ${LDFLAGS} -static -o inotifywatch.static inotifywatch.o common.o ../libinotifytools/src/.libs/libinotifytools.a ${LOCALBASE}/lib/libinotify.a
		39
		40	post-install-STATIC-on:
		41	${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywait.static ${STAGEDIR}${PREFIX}/bin
		42	${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywatch.static ${STAGEDIR}${PREFIX}/bin
		43
29	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)sysutils/inotify-tools/files/patch-src_common.c (-14 lines)
1	--- src/common.c.orig 2010-02-02 14:55:19 UTC
2	+++ src/common.c
3	@@ -41,9 +41,9 @@ void print_event_descriptions() {
4	}
5
6	int isdir( char const * path ) {
7	- static struct stat64 my_stat;
8	+ static struct stat my_stat;
9
10	- if ( -1 == lstat64( path, &my_stat ) ) {
11	+ if ( -1 == lstat( path, &my_stat ) ) {
12	if (errno == ENOENT) return 0;
13	fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
14	return 0;