ports/174196: sysutils/lineak-xosdplugin: Fix build with clang

KATO Tsuguru tkato432 at yahoo.com
Wed Dec 5 18:10:12 UTC 2012


>Number:         174196
>Category:       ports
>Synopsis:       sysutils/lineak-xosdplugin: Fix build with clang
>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 Dec 05 18:10:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Fix build with clang

Remove file:
files/patch-configure

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/sysutils/lineak-xosdplugin/Makefile sysutils/lineak-xosdplugin/Makefile
--- /usr/ports/sysutils/lineak-xosdplugin/Makefile	2012-11-08 07:52:33.000000000 +0900
+++ sysutils/lineak-xosdplugin/Makefile	2012-11-09 04:36:08.000000000 +0900
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lineak-xosdplugin
-# Date created:		2004-12-29
-# Whom:			Kay Lehmann <kay_lehmann at web.de>
-#
+# Created by: Kay Lehmann <kay_lehmann at web.de>
 # $FreeBSD: head/sysutils/lineak-xosdplugin/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
 
 PORTNAME=	lineak-xosdplugin
 PORTVERSION=	0.9
@@ -15,25 +11,29 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Xosd-plugin for lineakd
 
-LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd \
-		xosd.4:${PORTSDIR}/misc/xosd
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	xosd:${PORTSDIR}/misc/xosd \
+		lineak:${PORTSDIR}/sysutils/lineakd
 
-USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--program-prefix=''
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_path_xosd_config_script="${TRUE}"
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=		lineak_xosdplugin.1
-MAN_COMPRESSED=	yes
 PLIST_FILES=	lib/lineakd/plugins/xosdplugin.la \
 		lib/lineakd/plugins/xosdplugin.so
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|"-O2 $$CXXFLAGS"|"$$CXXFLAGS"| ; \
+		 s|echo aout|echo elf| ; \
+		 /LDFLAGS/s|-ldl||' ${WRKSRC}/configure   
 
 .include <bsd.port.mk>
diff -urN /usr/ports/sysutils/lineak-xosdplugin/files/patch-configure sysutils/lineak-xosdplugin/files/patch-configure
--- /usr/ports/sysutils/lineak-xosdplugin/files/patch-configure	2012-11-08 07:52:33.000000000 +0900
+++ sysutils/lineak-xosdplugin/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- configure.orig	Fri Mar  4 18:18:18 2005
-+++ configure	Sun Apr  3 12:19:59 2005
-@@ -21299,7 +21299,7 @@
- echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
- 
--   LDFLAGS="$all_libraries -L${x_libraries} $X_LDFLAGS -lX11 -lXext -ldl"
-+   LDFLAGS="$all_libraries -L${x_libraries} $LDFLAGS $X_LDFLAGS -lX11 -lXext -ldl"
-    CPPFLAGS="$all_includes -I${x_includes} ${CPPFLAGS} "
-       echo "$as_me:$LINENO: checking for ac_check_lineak in -llineak" >&5
- echo $ECHO_N "checking for ac_check_lineak in -llineak... $ECHO_C" >&6
>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list