svn commit: r448240 - in head/sysutils/inotify-tools: . files

[Steve Wills]

Author: swills
Date: Fri Aug 18 15:25:32 2017
New Revision: 448240
URL: https://svnweb.freebsd.org/changeset/ports/448240

Log:
  sysutils/inotify-tools: multiple cleanups
  
  * Added STATIC option
  * Fixed license
  * Simplified patches
  * Switched to USES=localbase
  * Reorganized sections
  
  PR:		221595
  Submitted by:	Yuri Victorovich <yuri at rawbw.com> (maintainer)

Deleted:
  head/sysutils/inotify-tools/files/patch-src_common.c
Modified:
  head/sysutils/inotify-tools/Makefile
  head/sysutils/inotify-tools/files/patch-configure.ac
  head/sysutils/inotify-tools/pkg-plist   (contents, props changed)

Modified: head/sysutils/inotify-tools/Makefile
==============================================================================
--- head/sysutils/inotify-tools/Makefile	Fri Aug 18 15:09:08 2017	(r448239)
+++ head/sysutils/inotify-tools/Makefile	Fri Aug 18 15:25:32 2017	(r448240)
@@ -4,26 +4,41 @@
 PORTNAME=	inotify-tools
 PORTVERSION=	3.14.01
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri at 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>

Modified: head/sysutils/inotify-tools/files/patch-configure.ac
==============================================================================
--- head/sysutils/inotify-tools/files/patch-configure.ac	Fri Aug 18 15:09:08 2017	(r448239)
+++ head/sysutils/inotify-tools/files/patch-configure.ac	Fri Aug 18 15:25:32 2017	(r448240)
@@ -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')

Modified: head/sysutils/inotify-tools/pkg-plist
==============================================================================
--- head/sysutils/inotify-tools/pkg-plist	Fri Aug 18 15:09:08 2017	(r448239)
+++ head/sysutils/inotify-tools/pkg-plist	Fri Aug 18 15:25:32 2017	(r448240)
@@ -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