Date: Thu, 13 Mar 2014 03:32:58 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/187497: x11-wm/ede: Fix build on -current Message-ID: <20140313033258.7cece9af429c839baa64884d@yahoo.com> Resent-Message-ID: <201403121840.s2CIe2BJ044716@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187497
>Category: ports
>Synopsis: x11-wm/ede: Fix build on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 12 18:40:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/ede/Makefile x11-wm/ede/Makefile
--- /usr/ports/x11-wm/ede/Makefile 2014-01-06 05:27:36.000000000 +0900
+++ x11-wm/ede/Makefile 2014-03-13 00:00:00.000000000 +0900
@@ -17,20 +17,21 @@
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 @@
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 @@
@${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} \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140313033258.7cece9af429c839baa64884d>