From owner-svn-ports-all@freebsd.org  Thu Oct  5 11:46:45 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62C30E35F25;
 Thu,  5 Oct 2017 11:46:45 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2F44E6D1D4;
 Thu,  5 Oct 2017 11:46:45 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v95BkiwQ022955;
 Thu, 5 Oct 2017 11:46:44 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v95BkiMf022954;
 Thu, 5 Oct 2017 11:46:44 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201710051146.v95BkiMf022954@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 5 Oct 2017 11:46:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451302 - head/x11-wm/libcompizconfig
X-SVN-Group: ports-head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/x11-wm/libcompizconfig
X-SVN-Commit-Revision: 451302
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Oct 2017 11:46:45 -0000

Author: bapt
Date: Thu Oct  5 11:46:44 2017
New Revision: 451302
URL: https://svnweb.freebsd.org/changeset/ports/451302

Log:
  Use helpers to avoid including pre.mk and post.mk

Modified:
  head/x11-wm/libcompizconfig/Makefile

Modified: head/x11-wm/libcompizconfig/Makefile
==============================================================================
--- head/x11-wm/libcompizconfig/Makefile	Thu Oct  5 10:38:13 2017	(r451301)
+++ head/x11-wm/libcompizconfig/Makefile	Thu Oct  5 11:46:44 2017	(r451302)
@@ -9,6 +9,8 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Alternative configuration system for Compiz
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz
 
 GNU_CONFIGURE=	yes
@@ -27,12 +29,7 @@ INOTIFY_DESC?=	Enable inotify support
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 INOTIFY_LDFLAGS=	-linotify
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if empty(PORT_OPTIONS:MINOTIFY)
-	@${REINPLACE_CMD} -e 's|sys/inotify.h||' ${WRKSRC}/configure
-.endif
 	@echo "OSVERSION=${OSVERSION}"
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|'	\
 		${WRKSRC}/src/main.c			\
@@ -41,9 +38,12 @@ post-patch:
 		${WRKSRC}/src/ini.c			\
 		${WRKSRC}/backend/ini.c
 
+post-patch-INOTIFY-off:
+	@${REINPLACE_CMD} -e 's|sys/inotify.h||' ${WRKSRC}/configure
+
 post-install:
 .for l in compizconfig/backends/libini.so compiz/libccp.so libcompizconfig.so.0.0.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>