Index: head/sysutils/inotify-tools/Makefile =================================================================== --- head/sysutils/inotify-tools/Makefile (revision 448239) +++ head/sysutils/inotify-tools/Makefile (revision 448240) @@ -1,29 +1,44 @@ # Created by: Yuri Victorovich # $FreeBSD$ 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 Index: head/sysutils/inotify-tools/files/patch-src_common.c =================================================================== --- head/sysutils/inotify-tools/files/patch-src_common.c (revision 448239) +++ head/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: head/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: head/sysutils/inotify-tools/files/patch-configure.ac =================================================================== --- head/sysutils/inotify-tools/files/patch-configure.ac (revision 448239) +++ head/sysutils/inotify-tools/files/patch-configure.ac (revision 448240) @@ -1,18 +1,10 @@ --- configure.ac.orig 2014-11-09 20:57:04 UTC +++ configure.ac @@ -44,6 +44,7 @@ AM_CONDITIONAL([STATIC_BINARY_ENABLE], t # Checks for libraries. +AC_SEARCH_LIBS(inotify_init, inotify) # 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: head/sysutils/inotify-tools/pkg-plist =================================================================== --- head/sysutils/inotify-tools/pkg-plist (revision 448239) +++ head/sysutils/inotify-tools/pkg-plist (revision 448240) @@ -1,11 +1,13 @@ 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 lib/libinotifytools.a lib/libinotifytools.so lib/libinotifytools.so.0 lib/libinotifytools.so.0.4.1 man/man1/inotifywait.1.gz man/man1/inotifywatch.1.gz Property changes on: head/sysutils/inotify-tools/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property