Date: Sat, 25 Oct 2003 15:04:41 +0200 (CEST) From: Simon Barner <barner@in.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kay_lehmann@web.de Subject: ports/58518: sysutils/lineakd: fix libintl and libiconv depedencies => avoid conflicts with other ports Message-ID: <20031025130441.DF263CE4@zi025.glhnet.mhn.de> Resent-Message-ID: <200310251310.h9PDAG4G009841@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58518 >Category: ports >Synopsis: sysutils/lineakd: fix libintl and libiconv depedencies => avoid conflicts with other ports >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: Sat Oct 25 06:10:15 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Simon Barner >Release: FreeBSD 4.9-PRERELEASE i386 >Organization: >Environment: System: FreeBSD zi025.glhnet.mhn.de 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #1: Thu Sep 4 20:49:53 CEST 2003 simon@zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386 >Description: This port also installs a libtool archive (libnmz.la). Unfortunatelly, I was not able to fix this within a reasonable amount of time (I tried USE_LIBTOOL, but that did not work). This patch fixes the following issues: This port did not pick up the two libraries mentioned. One possitive side effect of getting the libintl dependency right, is that the port does not build its included version of the gettext library and does not install those two .alias that were conflicting with other ports (have a look at the pkg-plist diff and you'll see what I mean) http://freebsd.rambler.ru/bsdmail/freebsd-ports_2003/msg08919.html I also changed the port to use NOPORTDOCS. >How-To-Repeat: >Fix: diff -ruN lineakd/Makefile lineakd.patched/Makefile --- lineakd/Makefile Mon Sep 29 16:32:13 2003 +++ lineakd.patched/Makefile Sat Oct 25 15:00:03 2003 @@ -15,21 +15,35 @@ MAINTAINER= kay_lehmann@web.de COMMENT= Lineakd is a daemon which enables special keys on internet keyboards -LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \ + iconv.3:${PORTSDIR}/converters/libiconv USE_BISON= yes USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS+= -I${X11BASE}/include +DOC_FILES= README AUTHORS NEWS TODO ChangeLog + .include <bsd.port.pre.mk> -EXTRA_PATCHES= ${FILESDIR}/extra-patch-lineakd.c-4 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-lineakd.c-4 .if ${OSVERSION} >= 500000 EXTRA_PATCHES= ${FILESDIR}/extra-patch-lineakd.c-5 +.endif + +post-install: + +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for doc in ${DOC_FILES} + @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} +.endfor .endif .include <bsd.port.post.mk> diff -ruN lineakd/files/patch-Makefile.in lineakd.patched/files/patch-Makefile.in --- lineakd/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ lineakd.patched/files/patch-Makefile.in Sat Oct 25 14:46:54 2003 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Oct 25 14:45:08 2003 ++++ Makefile.in Sat Oct 25 14:46:36 2003 +@@ -433,7 +433,7 @@ + + info-am: + +-install-data-am: install-lineakddocDATA ++install-data-am: + + install-exec-am: + diff -ruN lineakd/pkg-plist lineakd.patched/pkg-plist --- lineakd/pkg-plist Mon Sep 29 16:32:13 2003 +++ lineakd.patched/pkg-plist Sat Oct 25 14:57:30 2003 @@ -1,13 +1,8 @@ bin/lineakd etc/lineakkb.def -lib/charset.alias -share/locale/locale.alias -share/doc/lineakd/README -share/doc/lineakd/COPYING -share/doc/lineakd/AUTHORS -share/doc/lineakd/ChangeLog -share/doc/lineakd/INSTALL -share/doc/lineakd/NEWS -share/doc/lineakd/TODO -share/doc/lineakd/ABOUT-NLS -@dirrm share/doc/lineakd +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031025130441.DF263CE4>