Attachment 185535 Details for Bug 221595 – patch

[patch] patch

inotify-tools.patch (text/plain), 3.65 KB, created by Yuri Victorovich on 2017-08-17 19:05:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-08-17 19:05:00 UTC

Size: 3.65 KB

patch

obsolete

>Index: sysutils/inotify-tools/Makefile
>===================================================================
>--- sysutils/inotify-tools/Makefile	(revision 448175)
>+++ sysutils/inotify-tools/Makefile	(working copy)
>@@ -4,26 +4,41 @@
> 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=	AGPLv3
>+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
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+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>
>Index: sysutils/inotify-tools/files/patch-configure.ac
>===================================================================
>--- sysutils/inotify-tools/files/patch-configure.ac	(revision 448175)
>+++ sysutils/inotify-tools/files/patch-configure.ac	(working copy)
>@@ -8,11 +8,3 @@
>  
>  # Checks for header files.
>  AC_CHECK_HEADERS([sys/inotify.h mcheck.h])
>-@@ -62,6 +63,7 @@ AC_C_CONST
>- AC_C_INLINE
>- 
>- # Checks for library functions.
>-+AC_CHECK_FUNCS(stat64, [], [CPPFLAGS="$CPPFLAGS -Dstat64=stat -Dlstat64=lstat"])
>- 
>- # Set variables used in man page templates
>- MAN_DATE=$(date +'%B %d, %Y')
>Index: sysutils/inotify-tools/files/patch-src_common.c
>===================================================================
>--- sysutils/inotify-tools/files/patch-src_common.c	(revision 448175)
>+++ sysutils/inotify-tools/files/patch-src_common.c	(nonexistent)
>@@ -1,14 +0,0 @@
>---- 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;
>
>Property changes on: sysutils/inotify-tools/files/patch-src_common.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-on
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/inotify-tools/pkg-plist
>===================================================================
>--- sysutils/inotify-tools/pkg-plist	(revision 448175)
>+++ sysutils/inotify-tools/pkg-plist	(working copy)
>@@ -1,5 +1,7 @@
> bin/inotifywait
> bin/inotifywatch
>+%%STATIC%%bin/inotifywait.static
>+%%STATIC%%bin/inotifywatch.static
> include/inotifytools/inotify-nosys.h
> include/inotifytools/inotify.h
> include/inotifytools/inotifytools.h

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 221595: 185535