Bug 187497 - x11-wm/ede: Fix build on -current
x11-wm/ede: Fix build on -current
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Martin Wilke
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2014-03-12 18:40 UTC by tkato432
Modified: 2014-05-18 06:10 UTC (History)
0 users

See Also:


Attachments
file.diff (1.86 KB, patch)
2014-03-12 18:40 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2014-03-12 18:40:01 UTC
- Fix build on -current
Comment 1 Edwin Groothuis freebsd_committer 2014-03-12 18:41:21 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter freebsd_committer 2014-05-18 06:00:35 UTC
Author: miwi
Date: Sun May 18 05:00:30 2014
New Revision: 354393
URL: http://svnweb.freebsd.org/changeset/ports/354393
QAT: https://qat.redports.org/buildarchive/r354393/

Log:
  - Fix build with clang
  
  PR:		187497
  Submitted by:	Ports Fury

Modified:
  head/x11-wm/ede/Makefile

Modified: head/x11-wm/ede/Makefile
==============================================================================
--- head/x11-wm/ede/Makefile	Sun May 18 04:59:13 2014	(r354392)
+++ head/x11-wm/ede/Makefile	Sun May 18 05:00:30 2014	(r354393)
@@ -17,20 +17,21 @@ LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-		jam:${PORTSDIR}/devel/jam \
-		python:${PORTSDIR}/lang/python
+		jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
-OPTIONS_DEFINE=	HAL
-HAL_DESC=	Enable HAL support
-
-USES=		fam iconv gettext pathfix pkgconfig shared-mime-info
+USES=		fam iconv:translit gettext pathfix pkgconfig \
+		shared-mime-info shebangfix
+SHEBANG_FILES=	doc/asciidoc/asciidoc.py
+python_OLD_CMD=	${SETENV} python
+python_CMD=	${PYTHON_CMD}
 USE_XORG=	xcomposite xft xinerama xpm xrandr
-USE_PYTHON=	yes
+USE_PYTHON=	2
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	PEKWM_CXXFLAGS="${CXXFLAGS}"
 CONFIGURE_ARGS=	--with-edelib_path=${EDELIB_WRKSRC} \
 		--with-fltk-path=${LOCALBASE}
 INSTALL_ICONS=	yes
@@ -41,15 +42,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS_INSTALL=	pekwm-[0-9]*
 
+OPTIONS_DEFINE=		HAL
+
+HAL_LIB_DEPENDS=	libhal.so.1:${PORTSDIR}/sysutils/hal
+HAL_CONFIGURE_ENABLE=	hal
+
 EDELIB_NAME=	edelib
 EDELIB_VERSION=	${PORTVERSION}
 EDELIB_DISTNAME=${EDELIB_NAME}-${EDELIB_VERSION}
 EDELIB_DISTFILE=${EDELIB_DISTNAME}${EXTRACT_SUFX}
 EDELIB_WRKSRC=	${WRKDIR}/${EDELIB_DISTNAME}
 
-HAL_LIB_DEPENDS=	libhal.so.1:${PORTSDIR}/sysutils/hal
-HAL_CONFIGURE_OFF=	--disable-hal
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/share|${LOCALBASE}/share| ; \
@@ -60,6 +63,8 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|$$(CC)|@CXX@| ; \
 		 s|-lstdc++||' ${WRKSRC}/Jamconfig.in
+	@${REINPLACE_CMD} -e \
+		 '/desktop-links/s|^|#|' ${WRKSRC}/data/Jamfile
 
 pre-configure:
 	@(cd ${EDELIB_WRKSRC} \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Martin Wilke freebsd_committer 2014-05-18 06:00:42 UTC
State Changed
From-To: open->closed

Committed. Thanks!