Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Feb 2016 19:16:14 +0000 (UTC)
From:      David Naylor <dbn@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407834 - head/devel/kdesvn-kde4
Message-ID:  <201602021916.u12JGE3Q019816@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbn
Date: Tue Feb  2 19:16:14 2016
New Revision: 407834
URL: https://svnweb.freebsd.org/changeset/ports/407834

Log:
  devel/kdesvn-kde4: unbreak build on FreeBSD 9
  
   - Require a modern C compiler (GCC 4.2 is too old) [1]
   - Use OPTIONS helpers
   - Remove include of bsd.port.options.mk
  
  Reported by:	pkg-fallout [1]

Modified:
  head/devel/kdesvn-kde4/Makefile

Modified: head/devel/kdesvn-kde4/Makefile
==============================================================================
--- head/devel/kdesvn-kde4/Makefile	Tue Feb  2 18:29:07 2016	(r407833)
+++ head/devel/kdesvn-kde4/Makefile	Tue Feb  2 19:16:14 2016	(r407834)
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libsvn_client-1.so:${PORTSD
 
 CONFLICTS=	qsvn-[0-9]*
 
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource compiler:c11 tar:xz
 CMAKE_ARGS+=	-DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \
 		-DMAN_INSTALL_DIR=${MANPREFIX}/man
 USE_KDE4=	kdelibs kdeprefix automoc4
@@ -24,24 +24,18 @@ USE_QT4=	corelib gui xml network dbus sv
 		qmake_build moc_build rcc_build uic_build linguist_build
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_NLS_USES=	gettext
 
 post-patch:
 	${RM} ${WRKSRC}/src/kiosvn/svn*.protocol
-.if empty(PORT_OPTIONS:MDOCS)
+
+post-patch-DOCS-off:
 	${ECHO} "ADD_SUBDIRECTORY(man)" > ${WRKSRC}/doc/CMakeLists.txt
-.endif
-.if empty(PORT_OPTIONS:MNLS)
+
+post-patch-NLS-off:
 	${REINPLACE_CMD} -e 's,ADD_SUBDIRECTORY(po), ,g' \
 		${WRKSRC}/CMakeLists.txt
-.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602021916.u12JGE3Q019816>