aboutsummaryrefslogtreecommitdiff
path: root/comms/gnokii
diff options
context:
space:
mode:
authorAnders Nordby <anders@FreeBSD.org>2002-08-14 06:48:58 +0000
committerAnders Nordby <anders@FreeBSD.org>2002-08-14 06:48:58 +0000
commit92e196d087f96be32e069607b66b58ccd8bae59d (patch)
tree0a6e64a0752b2ccd03c11fcb1e4b85eb563a6921 /comms/gnokii
parentec95d356cf4d978b126f52c8cffe2a4d8d1ab23a (diff)
downloadports-92e196d087f96be32e069607b66b58ccd8bae59d.tar.gz
ports-92e196d087f96be32e069607b66b58ccd8bae59d.zip
Notes
Diffstat (limited to 'comms/gnokii')
-rw-r--r--comms/gnokii/Makefile6
-rw-r--r--comms/gnokii/distinfo2
-rw-r--r--comms/gnokii/files/patch-Docs-Makefile4
-rw-r--r--comms/gnokii/files/patch-Makefile12
-rw-r--r--comms/gnokii/files/patch-Makefile.global.in11
-rw-r--r--comms/gnokii/files/patch-configure14
-rw-r--r--comms/gnokii/files/patch-gnokii-Makefile16
7 files changed, 30 insertions, 35 deletions
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 8820af3c7378..0650415c641d 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,13 +6,11 @@
#
PORTNAME= gnokii
-PORTVERSION= 0.4.0.p20
+PORTVERSION= 0.4.3
PORTEPOCH= 1
CATEGORIES= comms
-MASTER_SITES= ftp://ftp.gnokii.org/pub/gnokii/pre/ \
- ftp://urtica.linuxnews.pl/pub/people/pkot/gnokii/ \
+MASTER_SITES= ftp://ftp.gnokii.org/pub/gnokii/ \
http://freesoftware.fsf.org/download/gnokii/
-DISTNAME= ${PORTNAME}-0.4.0pre20
MAINTAINER= anders@FreeBSD.org
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 7b2e224b850a..b2dfd91d3da6 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1 +1 @@
-MD5 (gnokii-0.4.0pre20.tar.gz) = 65eac9f3a4f5d7f050058eb76c121ae8
+MD5 (gnokii-0.4.3.tar.gz) = ecf5c04d1bef362cc0b4940e2c647e09
diff --git a/comms/gnokii/files/patch-Docs-Makefile b/comms/gnokii/files/patch-Docs-Makefile
index 3f3fc47b8864..726d8ff324da 100644
--- a/comms/gnokii/files/patch-Docs-Makefile
+++ b/comms/gnokii/files/patch-Docs-Makefile
@@ -1,5 +1,5 @@
---- Docs/Makefile.orig Fri May 10 00:31:47 2002
-+++ Docs/Makefile Wed May 22 03:09:44 2002
+--- Docs/Makefile.orig Thu Aug 8 23:07:58 2002
++++ Docs/Makefile Thu Aug 8 23:08:44 2002
@@ -32,19 +32,20 @@
@echo
diff --git a/comms/gnokii/files/patch-Makefile b/comms/gnokii/files/patch-Makefile
index b3dfa64bac67..e69de29bb2d1 100644
--- a/comms/gnokii/files/patch-Makefile
+++ b/comms/gnokii/files/patch-Makefile
@@ -1,12 +0,0 @@
---- Makefile.orig Wed May 22 02:17:56 2002
-+++ Makefile Wed May 22 02:19:41 2002
-@@ -157,6 +157,9 @@
- fi; \
- done
-
-+ @if [ "x$(USE_NLS)" = xyes ]; then \
-+ $(MAKE) -C $(PO_DIR) install; \
-+ fi
- @if [ "$(GTK_LIBS)" ]; then \
- for dir in $(GTK_DIRS); do \
- if [ -e $$dir/Makefile ]; then \
diff --git a/comms/gnokii/files/patch-Makefile.global.in b/comms/gnokii/files/patch-Makefile.global.in
index 9b631e2de08c..5680ed4a0a1f 100644
--- a/comms/gnokii/files/patch-Makefile.global.in
+++ b/comms/gnokii/files/patch-Makefile.global.in
@@ -1,16 +1,17 @@
---- Makefile.global.in.orig Fri May 10 00:31:47 2002
-+++ Makefile.global.in Wed May 22 02:22:26 2002
+--- Makefile.global.in.orig Mon Aug 5 18:21:20 2002
++++ Makefile.global.in Thu Aug 8 23:39:06 2002
@@ -22,13 +22,13 @@
bindir = @bindir@
sbindir = @sbindir@
--xbindir = ${prefix}/X11R6/bin/
+-xbindir = @XGNOKIIDIR@/bin/
+xbindir = ${prefix}/bin/
libdir = @libdir@
- xgnokii_libdir = @XGNOKIIDIR@/@XPACKAGE@
+-xgnokii_libdir = @XGNOKIIDIR@/share/@XPACKAGE@
++xgnokii_libdir = ${prefix}/share/@XPACKAGE@
man1dir = @mandir@/man1/
man8dir = @mandir@/man8/
--xmandir = ${prefix}/X11R6/man/man1/
+-xmandir = @XGNOKIIDIR@/man/man1/
-docdir = ${prefix}/doc/${PACKAGE}
+xmandir = ${man1dir}
+docdir = ${prefix}/share/doc/${PACKAGE}
diff --git a/comms/gnokii/files/patch-configure b/comms/gnokii/files/patch-configure
index 2df59f844725..715ecb972263 100644
--- a/comms/gnokii/files/patch-configure
+++ b/comms/gnokii/files/patch-configure
@@ -1,14 +1,6 @@
---- configure.orig Fri May 10 00:31:53 2002
-+++ configure Wed May 22 02:04:02 2002
-@@ -661,7 +661,6 @@
-
-
-
--CFLAGS="-O2 -Wall"
- ALL_LINGUAS="cs de et fi nl sk pl it sl"
-
- echo $ac_n "checking for include/config.h.in""... $ac_c" 1>&6
-@@ -1970,8 +1969,8 @@
+--- configure.orig Thu Aug 8 23:11:28 2002
++++ configure Thu Aug 8 23:12:05 2002
+@@ -1973,8 +1973,8 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
diff --git a/comms/gnokii/files/patch-gnokii-Makefile b/comms/gnokii/files/patch-gnokii-Makefile
new file mode 100644
index 000000000000..5cab81797031
--- /dev/null
+++ b/comms/gnokii/files/patch-gnokii-Makefile
@@ -0,0 +1,16 @@
+--- gnokii/Makefile.orig Mon Aug 5 18:21:20 2002
++++ gnokii/Makefile Thu Aug 8 23:26:03 2002
+@@ -25,12 +25,10 @@
+ GNOKII_LIB=libgnokii.so
+ endif
+
+-LDLIBS += -L$(TOPDIR)/common -lgnokii
+-
+ all: gnokii
+
+ gnokii: $(OBJS) $(TOPDIR)/common/gsm-filetypes.o $(TOPDIR)/common/$(GNOKII_LIB)
+- $(CC) $(LDFLAGS) $(OBJS) $(TOPDIR)/common/gsm-filetypes.o $(LDLIBS) -o $@
++ $(CC) $(LDFLAGS) $(OBJS) $(TOPDIR)/common/gsm-filetypes.o -L$(TOPDIR)/common -lgnokii $(LDLIBS) -o $@
+
+ $(TOPDIR)/getopt/libgetopt.a:
+ $(MAKE) -C $(TOPDIR)/getopt