Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Jan 2026 00:14:45 +0000
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cf54c6e472a3 - main - devel/gamin: Unbreak and improve port
Message-ID:  <69658e75.38e0b.e33c490@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cf54c6e472a376339bc8a176f3ae35cf17fc8e4e

commit cf54c6e472a376339bc8a176f3ae35cf17fc8e4e
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-01-11 18:12:21 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-01-13 00:13:18 +0000

    devel/gamin: Unbreak and improve port
    
    * Update MASTER_SITES and WWW
    * Rework port Makefile to follow porters handbook more closely
    
    Initial patch submitted by mew14930xvi
    
    PR:             292327
    Reported by:    Evgenii Khramtsov <2khramtsov@gmail.com>
---
 devel/gamin/Makefile | 71 +++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index e2e628e3ddd4..fe3843128f4f 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -1,61 +1,54 @@
 PORTNAME=	gamin
-PORTVERSION=	0.1.10
-PORTREVISION?=	10
-CATEGORIES?=	devel
-MASTER_SITES=	http://people.gnome.org/~veillard/gamin/sources/
+DISTVERSION=	0.1.10
+PORTREVISION=	10
+CATEGORIES=	devel
+MASTER_SITES=	GNOME
 
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	File and directory monitoring system
-WWW=		http://people.gnome.org/~veillard/gamin/index.html
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	File and directory monitoring system
+WWW=		https://gitlab.gnome.org/Archive/gamin
 
-USES+=		gettext gnome libtool pathfix pkgconfig
-USE_GNOME?=	glib20
+USES=		gettext gnome libtool localbase pathfix pkgconfig
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
-		--without-python
-CPPFLAGS+=	-DHAVE_LINUX -I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+
+CPPFLAGS+=	-DHAVE_LINUX
+
 INSTALL_TARGET=	install-strip
 
-CONFLICTS=	fam
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
+		--without-python
 
-.if !defined(GAMIN_SLAVE)
-OPTIONS_DEFINE=	GAM_POLLER LIBINOTIFY RUN_AS_EUID
-OPTIONS_DEFAULT=RUN_AS_EUID
-GAM_POLLER_DESC=Use gamin's poller instead of kqueue's
-LIBINOTIFY_DESC=Use libinotify as the FAM backend
-RUN_AS_EUID_DESC=Drop privileges to effective user
-.endif
+OPTIONS_DEFINE=		GAM_POLLER LIBINOTIFY RUN_AS_EUID
+OPTIONS_DEFAULT=	RUN_AS_EUID
 
-.include <bsd.port.options.mk>
+GAM_POLLER_DESC=	Use gamin's poller instead of kqueue's
+LIBINOTIFY_DESC=	Use libinotify as the FAM backend
+RUN_AS_EUID_DESC=	Drop privileges to effective user
 
-.if !defined(GAMIN_SLAVE)
-.if ${PORT_OPTIONS:MGAM_POLLER}
-CPPFLAGS+=	-DUSE_GAMIN_POLLER=1
-.endif
+GAM_POLLER_CPPFLAGS=	-DUSE_GAMIN_POLLER=1
+GAM_POLLER_CONFIGURE_ON=	--disable-kqueue
+
+RUN_AS_EUID_CPPFLAGS=	-DRUN_AS_EUID=1
+
+LIBINOTIFY_LDFLAGS=		-linotify
+LIBINOTIFY_CONFIGURE_ENABLE=	inotify
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLIBINOTIFY}
-CONFIGURE_ARGS+=--enable-inotify
-LIBS+=		-linotify
+.  if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500050
 LIB_DEPENDS+=	libinotify.so:devel/libinotify
-.else
-CONFIGURE_ARGS+=--disable-inotify
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MRUN_AS_EUID}
-CPPFLAGS+=	-DRUN_AS_EUID=1
+.  endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/server/gam_conf.c
 
-.if !defined(GAMIN_SLAVE)
-regression-test: build
-	@${ECHO_MSG} "===> Running gamin regression tests"
+do-test:
 	@(cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} tests)
-.endif
 
 .include <bsd.port.mk>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69658e75.38e0b.e33c490>