9 files changed, 139 insertions, 104 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index d7264cb25515..a17a7895a760 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -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 @@ USE_GTK=	yes
 
 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 @@ PLIST_SUB+=	X11='@comment '
 .else
 PLIST_SUB+=	X11=''
 .endif
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
 
 NO_PACKAGE=	"Group needs to be created"
-MAN1=	gnokii.1
-MAN8=	todologo.8
-
-DOCDIR=${WRKSRC}/Docs
-DOCDEST=${PREFIX}/share/doc/gnokii
-FIXPREFIX=	Docs/DataCalls-QuickStart Docs/README common/cfgreader.c
+MAN1=	gnokii.1 todologo.1
+.if !defined(WITHOUT_X11)
+MAN1+=	xgnokii.1
+.endif
+MAN8=	gnokiid.8 mgnokiidev.8
 
-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 --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 17a72b8367a6..d30aaf32ee2c 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1 +1 @@
-MD5 (gnokii-0.3.3_pre22.tar.gz) = 78a2b820caf46a1467f7e6fe72ddf00e
+MD5 (gnokii-0.3.3.tar.gz) = fae468985914c08f8dbb4f626038e48d
diff --git a/comms/gnokii/files/patch-Docs-Makefile b/comms/gnokii/files/patch-Docs-Makefile
new file mode 100644
index 000000000000..16daa1b848a8
--- /dev/null
+++ b/comms/gnokii/files/patch-Docs-Makefile
@@ -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 --git a/comms/gnokii/files/patch-Makefile b/comms/gnokii/files/patch-Makefile
new file mode 100644
index 000000000000..d80074b3985a
--- /dev/null
+++ b/comms/gnokii/files/patch-Makefile
@@ -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 --git a/comms/gnokii/files/patch-Makefile.global.in b/comms/gnokii/files/patch-Makefile.global.in
index 132bd593b3c5..7a095315b1bc 100644
--- a/comms/gnokii/files/patch-Makefile.global.in
+++ b/comms/gnokii/files/patch-Makefile.global.in
@@ -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 --git a/comms/gnokii/files/patch-configure.in b/comms/gnokii/files/patch-configure.in
index 0705db5b2ad9..7b0186e12b97 100644
--- a/comms/gnokii/files/patch-configure.in
+++ b/comms/gnokii/files/patch-configure.in
@@ -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 --git a/comms/gnokii/files/patch-gnokiid-Makefile b/comms/gnokii/files/patch-gnokiid-Makefile
new file mode 100644
index 000000000000..7d18607fd783
--- /dev/null
+++ b/comms/gnokii/files/patch-gnokiid-Makefile
@@ -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 --git a/comms/gnokii/pkg-message b/comms/gnokii/pkg-message
new file mode 100644
index 000000000000..5ad0638cc432
--- /dev/null
+++ b/comms/gnokii/pkg-message
@@ -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 --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 7f1f3349c535..74324c86f1ca 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -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 @@ share/locale/fi/LC_MESSAGES/gnokii.mo
 %%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 @@ share/locale/fi/LC_MESSAGES/gnokii.mo
 %%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 @@ share/locale/fi/LC_MESSAGES/gnokii.mo
 %%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 @@ share/locale/fi/LC_MESSAGES/gnokii.mo
 %%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 @@ share/locale/fi/LC_MESSAGES/gnokii.mo
 %%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