From owner-freebsd-ports-bugs Mon Jan 27 9:52: 9 2003 Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3AD837B401; Mon, 27 Jan 2003 09:52:04 -0800 (PST) Received: from mailout01.sul.t-online.com (mailout01.sul.t-online.com [194.25.134.80]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC6C243EB2; Mon, 27 Jan 2003 09:52:03 -0800 (PST) (envelope-from corecode@corecode.ath.cx) Received: from fwd02.sul.t-online.de by mailout01.sul.t-online.com with smtp id 18dDQQ-0005Bv-09; Mon, 27 Jan 2003 18:52:02 +0100 Received: from pride.uni.stoert.net (320050403952-0001@[217.82.50.249]) by fmrl02.sul.t-online.com with esmtp id 18dDQM-0QRzgOC; Mon, 27 Jan 2003 18:51:58 +0100 Received: from terrorfish.uni.stoert.net (terrorfish.uni.stoert.net [10.150.180.178]) by pride.uni.stoert.net (Postfix) with ESMTP id 3FE7312D72B; Mon, 27 Jan 2003 18:51:57 +0100 (CET) Received: from terrorfish.uni.stoert.net (localhost [127.0.0.1]) by terrorfish.uni.stoert.net (8.12.6/8.12.6) with ESMTP id h0RHqhFC003214; Mon, 27 Jan 2003 18:52:43 +0100 (CET) (envelope-from corecode@terrorfish.uni.stoert.net) Received: (from corecode@localhost) by terrorfish.uni.stoert.net (8.12.6/8.12.6/Submit) id h0RHqhSA003213; Mon, 27 Jan 2003 18:52:43 +0100 (CET) (envelope-from corecode) Date: Mon, 27 Jan 2003 18:52:39 +0100 From: "Simon 'corecode' Schubert" To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: anders@FreeBSD.org Subject: Re: ports/47516: unbreak comms/gnokii for -current Message-Id: <20030127185239.46cd8873.corecode@corecode.ath.cx> In-Reply-To: <200301261750.h0QHo22x063318@freefall.freebsd.org> References: <200301261749.h0QHn5bW021881@terrorfish.uni.stoert.net> <200301261750.h0QHo22x063318@freefall.freebsd.org> X-Mailer: Sylpheed version 0.8.8claws (GTK+ 1.2.10; i386-portbld-freebsd5.0) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="pgp-sha1"; boundary="=.n.TNuoW(+rUNXq" X-Sender: 320050403952-0001@t-dialin.net Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --=.n.TNuoW(+rUNXq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit uh yea. don't code while in a hurry. better use this patch: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/comms/gnokii/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 5 Nov 2002 21:26:49 -0000 1.17 +++ Makefile 26 Jan 2003 17:40:26 -0000 @@ -7,17 +7,19 @@ PORTNAME= gnokii PORTVERSION= 0.4.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= comms MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \ - http://freesoftware.fsf.org/download/gnokii/ -# ftp://ftp.gnokii.org/pub/gnokii/ + http://freesoftware.fsf.org/download/gnokii/ \ + ftp://ftp.gnokii.org/pub/gnokii/ MAINTAINER= anders@FreeBSD.org LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext USE_GMAKE= yes +USE_REINPLACE= yes .if !defined(WITHOUT_X11) USE_XPM= yes USE_GNOMENG= yes @@ -38,33 +40,31 @@ CONFIGURE_ENV+= MSGFMT="${LOCALBASE}/bin/msgfmt" \ XGETTEXT="${LOCALBASE}/bin/xgettext" -NO_PACKAGE= "Group needs to be created" MAN1= gnokii.1 todologo.1 .if !defined(WITHOUT_X11) MAN1+= xgnokii.1 .endif MAN8= gnokiid.8 mgnokiidev.8 -INSTALL_TARGET= install-suid +PKGDEINSTALL= ${PKGINSTALL} FIXPREFIX= Docs/man/gnokiid.8 Docs/DataCalls-QuickStart Docs/README \ common/cfgreader.c po/et.po po/sl.po post-patch: .for f in ${FIXPREFIX} - @${SED} -e "s:/etc/gnokiirc:${PREFIX}/etc/gnokiirc:g" \ - < ${WRKSRC}/${f} > ${WRKSRC}/${f}.post_sed - @${CP} ${WRKSRC}/${f}.post_sed ${WRKSRC}/${f} + @${REINPLACE_CMD} -e "s:/etc/gnokiirc:${PREFIX}/etc/gnokiirc:g" ${WRKSRC}/${f} .endfor - @${SED} -e "s:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:" \ - -e "s:%%PTHREAD_CFLAGS%%:${PTHREAD_CFLAGS}:" \ - < ${WRKSRC}/configure > ${WRKSRC}/configure.post_sed - @${CP} ${WRKSRC}/configure.post_sed ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:; \ + s:%%PTHREAD_CFLAGS%%:${PTHREAD_CFLAGS}:" ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,^\(#define[[:space:]]*_XOPEN_SOURCE.*\),/* \1 */,' \ + ${WRKSRC}/common/data/virtmodem.c ${WRKSRC}/utils/mgnokiidev.c pre-install: - @${SH} ${SCRIPTDIR}/creategroup + @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: + @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @(cd ${WRKSRC} && ${GMAKE} install-docs) ${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \ ${PREFIX}/etc/gnokiirc.sample Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-install 27 Jan 2003 17:51:01 -0000 @@ -0,0 +1,37 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/usr/sbin + +GROUP=gnokii + +SUIDBINS="${PKG_PREFIX}/sbin/gnokiid ${PKG_PREFIX}/sbin/mgnokiidev" +BINS="${PKG_PREFIX}/bin/gnokii ${PKG_PREFIX}/bin/xgnokii ${SUIDBINS}" + +case "$2" in +"PRE-INSTALL") + if pw group show "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if pw groupadd ${GROUP}; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi + fi + ;; + +"POST-INSTALL") + chown root:$GROUP $BINS && \ + chmod 750 ${BINS} && \ + chmod u+s ${SUIDBINS} || exit 1 + ;; + +"DEINSTALL") + if [ -z "`pw groupshow $GROUP 2>&1 | sed -E -e 's/^([^:]+:){3}(.*)$/\2/'`" ]; then + echo "Removing empty group \"$GROUP\"." + pw groupdel $GROUP + fi + ;; + +esac Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/comms/gnokii/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 23 May 2002 01:02:28 -0000 1.4 +++ pkg-plist 26 Jan 2003 17:10:12 -0000 @@ -113,6 +113,14 @@ %%X11%%share/xgnokii/xpm/Preview_6210.xpm %%X11%%share/xgnokii/xpm/Preview_6250.xpm %%X11%%share/xgnokii/xpm/Preview_7110.xpm +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/calendar +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/contacts +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/dtmf +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/main +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/netmon/gsm +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/sms +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/speeddial +%%X11%%@exec mkdir %D/share/xgnokii/help/en_US/xkeyb %%X11%%@dirrm share/xgnokii/help/en_US/cables %%X11%%@dirrm share/xgnokii/help/en_US/calendar %%X11%%@dirrm share/xgnokii/help/en_US/contacts Index: scripts/creategroup =================================================================== RCS file: scripts/creategroup diff -N scripts/creategroup --- scripts/creategroup 3 May 2001 01:13:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/sbin - -GROUP=gnokii - -if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." -else - if pw groupadd ${GROUP}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi cheers simon -- /"\ http://corecode.ath.cx/#donate \ / \ ASCII Ribbon Campaign / \ Against HTML Mail and News --=.n.TNuoW(+rUNXq Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+NXHrr5S+dk6z85oRAvNaAJ9gGy48ftQc4X84rK1ikygrO/MDmQCgg4wI Rs1gY/vLz+hvP7NigzBVrX8= =/age -----END PGP SIGNATURE----- --=.n.TNuoW(+rUNXq-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message