Attachment 130298 Details for Bug 174196 – sysutils_lineak-xosdplugin.diff

[patch] sysutils_lineak-xosdplugin.diff

sysutils_lineak-xosdplugin.diff (text/x-diff), 2.60 KB, created by tkato432 on 2012-12-11 17:55:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-12-11 17:55:42 UTC

Size: 2.60 KB

patch

obsolete

>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-12-10 16:01:16.000000000 +0900
>@@ -1,9 +1,5 @@
>-# New ports collection makefile for:	lineak-xosdplugin
>-# Date created:		2004-12-29
>-# Whom:			Kay Lehmann <kay_lehmann@web.de>
>-#
>+# Created by: Kay Lehmann <kay_lehmann@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,30 @@
> MAINTAINER=	ports@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
>+
>+CFLAGS+=	-fPIC
>+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

Actions: View | Diff

Attachments on bug 174196: 130297 | 130298