View | Details | Raw Unified | Return to bug 16611
Collapse All | Expand All

(-)libslang/Makefile (-4 / +4 lines)
Lines 1-15 Link Here
1
# New ports collection makefile for:    S-Lang library
1
# New ports collection makefile for:    S-Lang library
2
# Version required:     1.3.10
2
# Version required:     1.4.0
3
# Date created:         11 July 1996
3
# Date created:         11 July 1996
4
# Whom:                 ache
4
# Whom:                 ache
5
#
5
#
6
# $FreeBSD: ports/devel/libslang/Makefile,v 1.17 1999/12/29 21:35:41 steve Exp $
6
# $FreeBSD: ports/devel/libslang/Makefile,v 1.17 1999/12/29 21:35:41 steve Exp $
7
#
7
#
8
8
9
DISTNAME=	slang-1.3.10
9
DISTNAME=	slang-1.4.0
10
PKGNAME=	libslang-1.3.10
10
PKGNAME=	libslang-1.4.0
11
CATEGORIES=	devel
11
CATEGORIES=	devel
12
MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.3/
12
MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/
13
13
14
MAINTAINER=	xaa+ports@timewasters.nl
14
MAINTAINER=	xaa+ports@timewasters.nl
15
15
(-)libslang/files/md5 (-1 / +1 lines)
Line 1 Link Here
1
MD5 (slang-1.3.10.tar.bz2) = 884d276a366cd634583ed3190ae737a3
1
MD5 (slang-1.4.0.tar.bz2) = 2d450be2e24a035e4bac2ed185b8c09c
(-)libslang/patches/patch-aa (-32 / +26 lines)
Lines 1-9 Link Here
1
--- configure.orig	Sun Nov 14 07:20:57 1999
1
--- configure.orig	Sun Jan  9 20:38:14 2000
2
+++ configure	Thu Dec 23 11:26:42 1999
2
+++ configure	Wed Feb  9 16:18:35 2000
3
@@ -2152,33 +2152,24 @@
3
@@ -1865,6 +1865,19 @@
4
       ELF_LINK_CMD="\$(ELF_LINK)\$(ELFLIB_MAJOR)"
5
     fi
6
     ;;
7
+  *freebsd* )
8
+    if [ $PORTOBJFORMAT = elf ]; then
9
+      ELF_CC="\$(CC)"
10
+      ELF_CFLAGS="\$(CFLAGS) -fPIC"
11
+      ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
12
+      ELF_LINK_CMD="\$(ELF_LINK)"
13
+    else
14
+      ELF_CC="\$(CC)"
15
+      ELF_CFLAGS="\$(CFLAGS) -fPIC"
16
+      ELF_LINK="ld -Bshareable -x"
17
+      ELF_LINK_CMD="\$(ELF_LINK)"
18
+    fi
19
+    ;;
20
   * )
21
     echo "Note: ELF compiler for host_os=$host_os may be wrong"
22
     ELF_CC="\$(CC)"
23
@@ -2181,16 +2194,8 @@
4
 
24
 
5
 echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
25
 echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
6
 echo "configure:2155: checking SLANG_VERSION" >&5
26
 echo "configure:2184: checking SLANG_VERSION" >&5
7
-slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
27
-slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
8
-               awk '{ print $3 }'`
28
-               awk '{ print $3 }'`
9
-slang_major_version=`echo $slang_version |
29
-slang_major_version=`echo $slang_version |
Lines 14-47 Link Here
14
- awk '{ print ($1 - $2*10000 - $3*100) }'`
34
- awk '{ print ($1 - $2*10000 - $3*100) }'`
15
-
35
-
16
-slang_minor_version="$slang_minor_version.$slang_mminor_version"
36
-slang_minor_version="$slang_minor_version.$slang_mminor_version"
17
-slang_version="$slang_major_version.$slang_minor_version"
18
+slang_major_version=1
37
+slang_major_version=1
19
+slang_minor_version=3
38
+slang_minor_version=4
39
 slang_version="$slang_major_version.$slang_minor_version"
20
 echo "$ac_t""$slang_version" 1>&6
40
 echo "$ac_t""$slang_version" 1>&6
21
 
22
 
23
 
24
 
25
 
26
-if test "$GCC" = yes; then
27
-  ELF_CC="gcc"
28
-  ELF_CFLAGS="-O2 -fno-strength-reduce -fPIC"
29
-  ELF_LINK="gcc -shared -Wl,-soname#"
30
-  ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
31
+if [ $PORTOBJFORMAT = elf ]; then
32
+ELF_CC="\$(CC)"
33
+ELF_CFLAGS="\$(CFLAGS) -fPIC"
34
+ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
35
+ELF_LINK_CMD="\$(ELF_LINK)"
36
 else
37
-  ELF_CC="cc"
38
-  ELF_CFLAGS="-K pic"
39
-  ELF_LINK="ld -G -z text"
40
-  ELF_LINK_CMD="\$(ELF_LINK)"
41
+ELF_CC="\$(CC)"
42
+ELF_CFLAGS="\$(CFLAGS) -fPIC"
43
+ELF_LINK="ld -Bshareable -x"
44
+ELF_LINK_CMD="\$(ELF_LINK)"
45
 fi
46

Return to bug 16611