Date: Mon, 15 Oct 2001 02:56:43 +0200 (CEST) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/31275: Update port: comms/gnokii Message-ID: <20011015005643.D62E33D3A@totem.fix.no>
next in thread | raw e-mail | index | archive | help
>Number: 31275 >Category: ports >Synopsis: Update port: comms/gnokii >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 14 18:00:02 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 4.4-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: <Relevant environment information (multiple lines)> >Description: Update gnokii to version 0.3.3 final. Regain maintainership. Remove broken/fix MASTER_SITES entries. Misc. cleanup. Adds these files: files/patch-Docs-Makefile files/patch-Makefile files/patch-gnokiid-Makefile pkg-message >How-To-Repeat: <Code/input/activities to reproduce the problem (multiple lines)> >Fix: diff -Nur gnokii.old/Makefile gnokii/Makefile --- gnokii.old/Makefile Sun Oct 7 04:03:41 2001 +++ gnokii/Makefile Mon Oct 15 02:18:40 2001 @@ -7,14 +7,12 @@ PORTNAME= gnokii PORTVERSION= 0.3.3 +PORTEPOCH= 1 CATEGORIES= comms -MASTER_SITES= ftp://ftp.gnokii.org/pub/gnokii/pre/ \ - http://linuxcare.com.au/download/gnokii/pre/ \ - ftp://multivac.fatburen.org/pub/gnokii/pre/ \ +MASTER_SITES= ftp://ftp.gnokii.org/pub/gnokii/ \ ftp://urtica.linuxnews.pl/pub/people/pkot/gnokii/ -DISTNAME= ${PORTNAME}-${PORTVERSION}_pre22 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= anders@fix.no LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext @@ -27,7 +25,7 @@ GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libintl=${PREFIX} --enable-security \ +CONFIGURE_ARGS+= --with-libintl=${LOCALBASE} --enable-security \ --with-xgnokiidir=${PREFIX}/share .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x @@ -35,53 +33,23 @@ .else PLIST_SUB+= X11='' .endif -CONFIGURE_ENV= CFLAGS="${CFLAGS}" NO_PACKAGE= "Group needs to be created" -MAN1= gnokii.1 -MAN8= todologo.8 +MAN1= gnokii.1 todologo.1 +.if !defined(WITHOUT_X11) +MAN1+= xgnokii.1 +.endif +MAN8= gnokiid.8 mgnokiidev.8 -DOCDIR=${WRKSRC}/Docs -DOCDEST=${PREFIX}/share/doc/gnokii -FIXPREFIX= Docs/DataCalls-QuickStart Docs/README common/cfgreader.c - -post-patch: -.for f in ${FIXPREFIX} - ${PERL} -pi -e "s@/etc/gnokiirc@${PREFIX}/etc/gnokiirc@g" \ - ${WRKSRC}/${f} -.endfor +INSTALL_TARGET= install-suid pre-install: @${SH} ${SCRIPTDIR}/creategroup post-install: - @${INSTALL_DATA} ${DOCDIR}/sample/gnokiirc ${PREFIX}/etc/ - ${INSTALL_MAN} ${DOCDIR}/man/todologo.8 ${PREFIX}/man/man8/ -.if !defined(NOPORTDOCS) @(cd ${WRKSRC} && ${GMAKE} install-docs) - @${INSTALL} -d -o root -g wheel -m 0755 ${DOCDEST} - @${INSTALL_DATA} ${DOCDIR}/ChangeLog ${PREFIX}/share/doc/gnokii/ - @${INSTALL_DATA} ${DOCDIR}/Bugs ${DOCDEST}/ - @${INSTALL_DATA} ${DOCDIR}/FAQ ${DOCDEST}/ - @${INSTALL_DATA} ${DOCDIR}/ChangeLog ${DOCDEST}/ - @${INSTALL_DATA} ${DOCDIR}/CodingStyle ${DOCDEST}/ - @${INSTALL_DATA} ${DOCDIR}/README-2110 ${DOCDEST}/ - @${INSTALL_DATA} ${DOCDIR}/test.vcs ${PREFIX}/share/doc/gnokii/ - @${INSTALL} -d -o root -g wheel -m 0755 ${DOCDEST}/protocol - @${INSTALL_DATA} ${DOCDIR}/protocol/6110.txt ${DOCDEST}/protocol/ - @${INSTALL_DATA} ${DOCDIR}/protocol/7110.txt ${DOCDEST}/protocol/ - @${INSTALL} -d -o root -g wheel -m 0755 ${DOCDEST}/sample - @${INSTALL_DATA} ${DOCDIR}/sample/options ${DOCDEST}/sample/ - @${INSTALL_DATA} ${DOCDIR}/sample/pap-secrets ${DOCDEST}/sample/ - @${INSTALL_DATA} ${DOCDIR}/sample/ppp-gnokii ${DOCDEST}/sample/ - @${INSTALL_DATA} ${DOCDIR}/sample/ppp-on ${DOCDEST}/sample/ -.else - ${INSTALL_MAN} ${DOCDIR}/man/gnokii.1 ${PREFIX}/man/man1/ -.endif - @${ECHO} "================================================================================" - @${ECHO} "The default config is installed in ${PREFIX}/etc/gnokiirc, and is configured" - @${ECHO} "for Nokia 6110 phones connected on COM1. Have a look at the" - @${ECHO} "documentation/manpages for more information." - @${ECHO} "================================================================================" + ${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \ + ${PREFIX}/etc/gnokiirc.sample + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -Nur gnokii.old/distinfo gnokii/distinfo --- gnokii.old/distinfo Thu May 3 03:12:45 2001 +++ gnokii/distinfo Sun Oct 14 23:28:59 2001 @@ -1 +1 @@ -MD5 (gnokii-0.3.3_pre22.tar.gz) = 78a2b820caf46a1467f7e6fe72ddf00e +MD5 (gnokii-0.3.3.tar.gz) = fae468985914c08f8dbb4f626038e48d diff -Nur gnokii.old/files/patch-Docs-Makefile gnokii/files/patch-Docs-Makefile --- gnokii.old/files/patch-Docs-Makefile Thu Jan 1 01:00:00 1970 +++ gnokii/files/patch-Docs-Makefile Mon Oct 15 00:42:29 2001 @@ -0,0 +1,33 @@ +--- Docs/Makefile.orig Fri Sep 28 02:07:58 2001 ++++ Docs/Makefile Mon Oct 15 00:42:14 2001 +@@ -24,24 +24,26 @@ + packaging-howto \ + sample.gnokiirc + +-GNOKII1_MAN = "man/gnokii.1 man/todologo.1" +-GNOKII8_MAN = "man/gnokiid.8 man/mgnokiidev.8" ++GNOKII1_MAN = man/gnokii.1 man/todologo.1 ++GNOKII8_MAN = man/gnokiid.8 man/mgnokiidev.8 + XGNOKII_MAN = man/xgnokii.1x + + all: + @echo + + install: ++ifndef NOPORTDOCS + $(INSTALL) -d $(docdir) + @for xxx in $(INSTALL_DOCS); do \ + if [ -e $$xxx ]; then \ + $(INSTALL) -m 0444 $$xxx $(docdir)/$$xxx; \ + fi; \ + done ++endif + $(INSTALL) $(GNOKII1_MAN) $(man1dir) + $(INSTALL) $(GNOKII8_MAN) $(man8dir) +- if [ "x$HAVE_XGNOKII" = xyes ]; then \ +- $(INSTALL) $(XGNOKII_MAN) $(xmandir) \ ++ if [ "x$(HAVE_XGNOKII)" = xyes ]; then \ ++ $(INSTALL) $(XGNOKII_MAN) $(xmandir)/xgnokii.1; \ + fi + @echo "done" + diff -Nur gnokii.old/files/patch-Makefile gnokii/files/patch-Makefile --- gnokii.old/files/patch-Makefile Thu Jan 1 01:00:00 1970 +++ gnokii/files/patch-Makefile Mon Oct 15 02:07:10 2001 @@ -0,0 +1,15 @@ +--- Makefile.orig Fri Sep 28 02:07:58 2001 ++++ Makefile Mon Oct 15 02:07:01 2001 +@@ -153,8 +153,11 @@ + $(MAKE) -C $$dir install-suid; \ + fi; \ + done ++ @if [ "x$(USE_NLS)" = xyes ]; then \ ++ $(MAKE) -C $(PO_DIR) install; \ ++ fi + @if [ "$(GTK_LIBS)" ]; then \ +- @for dir in $(GTK_DIRS); do \ ++ for dir in $(GTK_DIRS); do \ + if [ -e $$dir/Makefile ]; then \ + $(MAKE) -C $$dir install-suid; \ + fi; \ diff -Nur gnokii.old/files/patch-Makefile.global.in gnokii/files/patch-Makefile.global.in --- gnokii.old/files/patch-Makefile.global.in Thu May 3 03:12:59 2001 +++ gnokii/files/patch-Makefile.global.in Sun Oct 14 23:58:13 2001 @@ -1,10 +1,18 @@ ---- Makefile.global.in.orig Tue May 1 21:42:36 2001 -+++ Makefile.global.in Tue May 1 21:42:46 2001 -@@ -27,7 +27,7 @@ +--- Makefile.global.in.orig Fri Sep 28 02:07:58 2001 ++++ Makefile.global.in Sun Oct 14 23:57:52 2001 +@@ -22,13 +22,13 @@ + + bindir = @bindir@ + sbindir = @sbindir@ +-xbindir = ${prefix}/X11R6/bin/ ++xbindir = ${prefix}/bin/ libdir = @libdir@/${PACKAGE} xgnokii_libdir = @XGNOKIIDIR@/@XPACKAGE@ - mandir = @mandir@/man1/ + man1dir = @mandir@/man1/ + man8dir = @mandir@/man8/ +-xmandir = ${prefix}/X11R6/man/man1/ -docdir = ${prefix}/doc/${PACKAGE} ++xmandir = ${man1dir} +docdir = ${prefix}/share/doc/${PACKAGE} locdir = @datadir@/locale diff -Nur gnokii.old/files/patch-configure.in gnokii/files/patch-configure.in --- gnokii.old/files/patch-configure.in Thu May 3 03:12:59 2001 +++ gnokii/files/patch-configure.in Sun Oct 14 23:39:12 2001 @@ -1,10 +1,10 @@ ---- configure.in.orig Sun Apr 15 14:35:18 2001 -+++ configure.in Tue May 1 22:50:59 2001 +--- configure.in.orig Sun Oct 14 23:38:48 2001 ++++ configure.in Sun Oct 14 23:38:58 2001 @@ -15,7 +15,6 @@ AC_PREFIX_DEFAULT("/usr/local") dnl ======================== Default setting -CFLAGS="-O2 -Wall" - ALL_LINGUAS="cs de et fi nl sk pl it" + ALL_LINGUAS="cs de et fi nl sk pl it sl" dnl ======================== Checks for programs. diff -Nur gnokii.old/files/patch-gnokiid-Makefile gnokii/files/patch-gnokiid-Makefile --- gnokii.old/files/patch-gnokiid-Makefile Thu Jan 1 01:00:00 1970 +++ gnokii/files/patch-gnokiid-Makefile Mon Oct 15 01:49:19 2001 @@ -0,0 +1,15 @@ +--- gnokiid/Makefile.orig Fri Sep 28 02:07:58 2001 ++++ gnokiid/Makefile Mon Oct 15 01:48:39 2001 +@@ -37,9 +37,9 @@ + @echo "done" + + install-suid: all +- @if [ -z "/bin/grep -e '^gnokii:' /etc/group" ]; then \ +- /usr/sbin/groupadd gnokii; \ +- fi ++ @if (/usr/sbin/pw groupshow gnokii >/dev/null 2>&1); \ ++ then echo "Group gnokii exists. Fine.";\ ++ else /usr/sbin/pw groupadd gnokii; fi + $(INSTALL) -d $(sbindir) + $(INSTALL) -o root -g gnokii -m 4750 gnokiid $(sbindir) + @echo "done" diff -Nur gnokii.old/pkg-message gnokii/pkg-message --- gnokii.old/pkg-message Thu Jan 1 01:00:00 1970 +++ gnokii/pkg-message Mon Oct 15 01:08:36 2001 @@ -0,0 +1,5 @@ +================================================================================ +The default config is installed in ${PREFIX}/etc/gnokiirc, and is configured +for Nokia 6110 phones connected on COM1. Have a look at the +documentation/manpages for more information. +================================================================================ diff -Nur gnokii.old/pkg-plist gnokii/pkg-plist --- gnokii.old/pkg-plist Thu May 3 03:12:45 2001 +++ gnokii/pkg-plist Sun Oct 14 23:58:27 2001 @@ -1,22 +1,38 @@ bin/gnokii +bin/todologo %%X11%%bin/xgnokii -%%X11%%bin/xlogos +etc/gnokiirc.sample sbin/gnokiid sbin/mgnokiidev -bin/todologo -etc/gnokiirc -share/locale/it/LC_MESSAGES/gnokii.mo -share/locale/pl/LC_MESSAGES/gnokii.mo -share/locale/de/LC_MESSAGES/gnokii.mo -share/locale/nl/LC_MESSAGES/gnokii.mo -share/locale/sk/LC_MESSAGES/gnokii.mo +%%PORTDOCS%%share/doc/gnokii/CREDITS +%%PORTDOCS%%share/doc/gnokii/DataCalls-QuickStart +%%PORTDOCS%%share/doc/gnokii/README +%%PORTDOCS%%share/doc/gnokii/README-3810 +%%PORTDOCS%%share/doc/gnokii/README-6110 +%%PORTDOCS%%share/doc/gnokii/README-WIN32 +%%PORTDOCS%%share/doc/gnokii/gettext-howto +%%PORTDOCS%%share/doc/gnokii/gnokii-ir-howto +%%PORTDOCS%%share/doc/gnokii/gnokii.nol +%%PORTDOCS%%share/doc/gnokii/packaging-howto +%%PORTDOCS%%@dirrm share/doc/gnokii share/locale/cs/LC_MESSAGES/gnokii.mo +share/locale/de/LC_MESSAGES/gnokii.mo share/locale/et/LC_MESSAGES/gnokii.mo share/locale/fi/LC_MESSAGES/gnokii.mo +share/locale/it/LC_MESSAGES/gnokii.mo +share/locale/nl/LC_MESSAGES/gnokii.mo +share/locale/pl/LC_MESSAGES/gnokii.mo +share/locale/sk/LC_MESSAGES/gnokii.mo +share/locale/sl/LC_MESSAGES/gnokii.mo %%X11%%share/xgnokii/help/C %%X11%%share/xgnokii/help/POSIX +%%X11%%share/xgnokii/help/en_US/COPYING +%%X11%%share/xgnokii/help/en_US/CREDITS %%X11%%share/xgnokii/help/en_US/cables/cables.html +%%X11%%share/xgnokii/help/en_US/config.html +%%X11%%share/xgnokii/help/en_US/faq.html %%X11%%share/xgnokii/help/en_US/firmware/firmware.html +%%X11%%share/xgnokii/help/en_US/index.html %%X11%%share/xgnokii/help/en_US/irda/irda.html %%X11%%share/xgnokii/help/en_US/netmon/faq_net0.html %%X11%%share/xgnokii/help/en_US/netmon/faq_net1.html @@ -33,6 +49,8 @@ %%X11%%share/xgnokii/help/en_US/netmon/nm_5110.gif %%X11%%share/xgnokii/help/en_US/netmon/nm_9110.gif %%X11%%share/xgnokii/help/en_US/netmon/tip.gif +%%X11%%share/xgnokii/help/en_US/sample/gnokiirc +%%X11%%share/xgnokii/help/en_US/styl.css %%X11%%share/xgnokii/help/en_US/windows/calendar/index.html %%X11%%share/xgnokii/help/en_US/windows/contacts/index.html %%X11%%share/xgnokii/help/en_US/windows/dtmf/index.html @@ -41,13 +59,14 @@ %%X11%%share/xgnokii/help/en_US/windows/sms/index.html %%X11%%share/xgnokii/help/en_US/windows/speeddial/index.html %%X11%%share/xgnokii/help/en_US/windows/xkeyb/index.html -%%X11%%share/xgnokii/help/en_US/sample/gnokiirc -%%X11%%share/xgnokii/help/en_US/config.html -%%X11%%share/xgnokii/help/en_US/faq.html -%%X11%%share/xgnokii/help/en_US/index.html -%%X11%%share/xgnokii/help/en_US/styl.css -%%X11%%share/xgnokii/help/en_US/CREDITS -%%X11%%share/xgnokii/help/en_US/COPYING +%%X11%%share/xgnokii/help/pl_PL/calendar.html +%%X11%%share/xgnokii/help/pl_PL/contacts.html +%%X11%%share/xgnokii/help/pl_PL/dtmf.html +%%X11%%share/xgnokii/help/pl_PL/index.html +%%X11%%share/xgnokii/help/pl_PL/netmon.html +%%X11%%share/xgnokii/help/pl_PL/netmon/dir0.gif +%%X11%%share/xgnokii/help/pl_PL/netmon/dir1.gif +%%X11%%share/xgnokii/help/pl_PL/netmon/glowna.htm %%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus.gif %%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus2.gif %%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_loga.htm @@ -70,9 +89,6 @@ %%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_5110.gif %%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_9110.gif %%X11%%share/xgnokii/help/pl_PL/netmon/gsm/tip.gif -%%X11%%share/xgnokii/help/pl_PL/netmon/dir0.gif -%%X11%%share/xgnokii/help/pl_PL/netmon/dir1.gif -%%X11%%share/xgnokii/help/pl_PL/netmon/glowna.htm %%X11%%share/xgnokii/help/pl_PL/netmon/htm.gif %%X11%%share/xgnokii/help/pl_PL/netmon/index.htm %%X11%%share/xgnokii/help/pl_PL/netmon/konw.js @@ -81,20 +97,20 @@ %%X11%%share/xgnokii/help/pl_PL/netmon/spis_d2.htm %%X11%%share/xgnokii/help/pl_PL/netmon/spis_g.htm %%X11%%share/xgnokii/help/pl_PL/netmon/styl.css -%%X11%%share/xgnokii/help/pl_PL/calendar.html -%%X11%%share/xgnokii/help/pl_PL/contacts.html -%%X11%%share/xgnokii/help/pl_PL/dtmf.html -%%X11%%share/xgnokii/help/pl_PL/index.html -%%X11%%share/xgnokii/help/pl_PL/netmon.html %%X11%%share/xgnokii/help/pl_PL/sms.html %%X11%%share/xgnokii/help/pl_PL/speeddial.html %%X11%%share/xgnokii/help/pl_PL/xkeyb.html +%%X11%%share/xgnokii/xpm/5110.xpm %%X11%%share/xgnokii/xpm/6110.xpm %%X11%%share/xgnokii/xpm/6150.xpm -%%X11%%share/xgnokii/xpm/5110.xpm +%%X11%%share/xgnokii/xpm/Preview_3210.xpm +%%X11%%share/xgnokii/xpm/Preview_3310.xpm +%%X11%%share/xgnokii/xpm/Preview_5110.xpm %%X11%%share/xgnokii/xpm/Preview_6110.xpm %%X11%%share/xgnokii/xpm/Preview_6150.xpm %%X11%%share/xgnokii/xpm/Preview_6210.xpm +%%X11%%share/xgnokii/xpm/Preview_6250.xpm +%%X11%%share/xgnokii/xpm/Preview_7110.xpm %%X11%%@dirrm share/xgnokii/help/en_US/cables %%X11%%@dirrm share/xgnokii/help/en_US/calendar %%X11%%@dirrm share/xgnokii/help/en_US/contacts @@ -114,38 +130,13 @@ %%X11%%@dirrm share/xgnokii/help/en_US/windows/sms %%X11%%@dirrm share/xgnokii/help/en_US/windows/speeddial %%X11%%@dirrm share/xgnokii/help/en_US/windows/xkeyb -%%X11%%@dirrm share/xgnokii/help/en_US/xkeyb %%X11%%@dirrm share/xgnokii/help/en_US/windows +%%X11%%@dirrm share/xgnokii/help/en_US/xkeyb %%X11%%@dirrm share/xgnokii/help/en_US/sample +%%X11%%@dirrm share/xgnokii/help/en_US %%X11%%@dirrm share/xgnokii/help/pl_PL/netmon/gsm %%X11%%@dirrm share/xgnokii/help/pl_PL/netmon %%X11%%@dirrm share/xgnokii/help/pl_PL -%%X11%%@dirrm share/xgnokii/help/en_US %%X11%%@dirrm share/xgnokii/help %%X11%%@dirrm share/xgnokii/xpm %%X11%%@dirrm share/xgnokii -%%PORTDOCS%%share/doc/gnokii/test.vcs -%%PORTDOCS%%share/doc/gnokii/sample/ppp-on -%%PORTDOCS%%share/doc/gnokii/sample/ppp-gnokii -%%PORTDOCS%%share/doc/gnokii/sample/pap-secrets -%%PORTDOCS%%share/doc/gnokii/sample/options -%%PORTDOCS%%share/doc/gnokii/protocol/7110.txt -%%PORTDOCS%%share/doc/gnokii/protocol/6110.txt -%%PORTDOCS%%share/doc/gnokii/packaging-howto -%%PORTDOCS%%share/doc/gnokii/gnokii.nol -%%PORTDOCS%%share/doc/gnokii/gnokii-ir-howto -%%PORTDOCS%%share/doc/gnokii/gettext-howto -%%PORTDOCS%%share/doc/gnokii/README-WIN32 -%%PORTDOCS%%share/doc/gnokii/README-6110 -%%PORTDOCS%%share/doc/gnokii/README-3810 -%%PORTDOCS%%share/doc/gnokii/README-2110 -%%PORTDOCS%%share/doc/gnokii/README -%%PORTDOCS%%share/doc/gnokii/FAQ -%%PORTDOCS%%share/doc/gnokii/DataCalls-QuickStart -%%PORTDOCS%%share/doc/gnokii/ChangeLog -%%PORTDOCS%%share/doc/gnokii/CodingStyle -%%PORTDOCS%%share/doc/gnokii/CREDITS -%%PORTDOCS%%share/doc/gnokii/Bugs -%%PORTDOCS%%@dirrm share/doc/gnokii/sample -%%PORTDOCS%%@dirrm share/doc/gnokii/protocol -%%PORTDOCS%%@dirrm share/doc/gnokii >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011015005643.D62E33D3A>