pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/libsscript Fix build with GCC 4 and add DESTDIR su...
details: https://anonhg.NetBSD.org/pkgsrc/rev/db4dc7c866a9
branches: trunk
changeset: 547560:db4dc7c866a9
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Sep 19 23:26:09 2008 +0000
description:
Fix build with GCC 4 and add DESTDIR support.
diffstat:
net/libsscript/Makefile | 6 ++++--
net/libsscript/distinfo | 6 +++---
net/libsscript/patches/patch-aa | 12 +++++-------
net/libsscript/patches/patch-ab | 26 ++++++++++++++++++++++++--
4 files changed, 36 insertions(+), 14 deletions(-)
diffs (103 lines):
diff -r 6398b9453bf0 -r db4dc7c866a9 net/libsscript/Makefile
--- a/net/libsscript/Makefile Fri Sep 19 20:02:23 2008 +0000
+++ b/net/libsscript/Makefile Fri Sep 19 23:26:09 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/03/24 19:21:29 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/09/19 23:26:09 joerg Exp $
#
DISTNAME= sscript-lib2.0
@@ -12,9 +12,11 @@
HOMEPAGE= http://www.linuxave.net/~drow/SocketScript/
COMMENT= Simple library for creating network oriented software in C
+PKG_DESTDIR_SUPPORT= user-destdir
+
NO_CONFIGURE= YES
USE_LIBTOOL= YES
-INSTALLATION_DIRS= lib
+INSTALLATION_DIRS= include/libsscript lib share/doc/libsscript
.include "../../mk/bsd.pkg.mk"
diff -r 6398b9453bf0 -r db4dc7c866a9 net/libsscript/distinfo
--- a/net/libsscript/distinfo Fri Sep 19 20:02:23 2008 +0000
+++ b/net/libsscript/distinfo Fri Sep 19 23:26:09 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/11/07 21:42:22 tv Exp $
+$NetBSD: distinfo,v 1.5 2008/09/19 23:26:09 joerg Exp $
SHA1 (sscript-lib2.0.tar) = f2de038ea95f2b553b57c5694fa6cd2530b6af30
RMD160 (sscript-lib2.0.tar) = 55fd459cb5d8b99a1bb6b0d4a846383a2ebef6e7
Size (sscript-lib2.0.tar) = 30720 bytes
-SHA1 (patch-aa) = a055668a994db3d865867f28fc64f5072b47933e
-SHA1 (patch-ab) = 2992654b4109c6751f350676192980755f163835
+SHA1 (patch-aa) = 37e4b3db1f3dcd7694530ea4018c59bca423e4c7
+SHA1 (patch-ab) = 353148dc85e81fb1303a326487d8ee0e39f5f7c6
diff -r 6398b9453bf0 -r db4dc7c866a9 net/libsscript/patches/patch-aa
--- a/net/libsscript/patches/patch-aa Fri Sep 19 20:02:23 2008 +0000
+++ b/net/libsscript/patches/patch-aa Fri Sep 19 23:26:09 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/03/30 14:59:28 rh Exp $
+$NetBSD: patch-aa,v 1.2 2008/09/19 23:26:09 joerg Exp $
--- Makefile.orig Wed Feb 2 02:01:39 2000
+++ Makefile Thu Mar 30 16:53:45 2000
-@@ -1,15 +1,15 @@
+@@ -1,15 +1,13 @@
# SScript library makefile.
-CC = gcc
@@ -17,11 +17,9 @@
install:
- cp libsscript.a /usr/lib/libsscript.a
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libsscript.la ${PREFIX}/lib
-+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/libsscript
-+ ${BSD_INSTALL_DATA} sscript.h ${PREFIX}/include/libsscript
-+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/libsscript
-+ ${BSD_INSTALL_DATA} sscript-lib.doc ${PREFIX}/share/doc/libsscript
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libsscript.la ${DESTDIR}${PREFIX}/lib
++ ${BSD_INSTALL_DATA} sscript.h ${DESTDIR}${PREFIX}/include/libsscript
++ ${BSD_INSTALL_DATA} sscript-lib.doc ${DESTDIR}${PREFIX}/share/doc/libsscript
clean:
rm -f *.a *.o *~
diff -r 6398b9453bf0 -r db4dc7c866a9 net/libsscript/patches/patch-ab
--- a/net/libsscript/patches/patch-ab Fri Sep 19 20:02:23 2008 +0000
+++ b/net/libsscript/patches/patch-ab Fri Sep 19 23:26:09 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2005/11/07 21:42:22 tv Exp $
+$NetBSD: patch-ab,v 1.2 2008/09/19 23:26:09 joerg Exp $
---- sscript.c.orig 2000-02-01 20:21:05.000000000 -0500
+--- sscript.c.orig 2000-02-02 02:21:05.000000000 +0100
+++ sscript.c
@@ -10,7 +10,9 @@
#include <sys/socket.h>
@@ -12,3 +12,25 @@
#include <strings.h>
#include <sys/file.h>
#include <signal.h>
+@@ -34,8 +36,8 @@ char *sscript_lindex(char *input_string,
+ static char tmpstring[1024];
+ int i;
+ strncpy(tmpstring,input_string,1024);
+- (char *)tokens[i=0] = (char *)strtok(tmpstring, " ");
+- while (((char *)tokens[++i] = (char *)strtok(NULL, " ")));
++ tokens[i=0] = strtok(tmpstring, " ");
++ while ((tokens[++i] = strtok(NULL, " ")));
+ tokens[i] = NULL;
+ return(tokens[word_number]);
+ }
+@@ -231,8 +233,8 @@ char *sscript_lrange(char *input_string,
+ strcpy(global_var[1],out_string);
+ return global_var[1]; }
+ strcpy(tmpstring,input_string);
+- (char *)tokens[i=0] = (char *)strtok(tmpstring, " ");
+- while(((char *)tokens[++i] = (char *)strtok(NULL, " ")));
++ tokens[i=0] = strtok(tmpstring, " ");
++ while((tokens[++i] = strtok(NULL, " ")));
+ tokens[i] = NULL;
+ i++;
+ if(i<starting_at) return (int)NULL;
Home |
Main Index |
Thread Index |
Old Index