Sun Jul 9 15:16:34 2023 UTC ()
stfl: Honour LDFLAGS. Should help the build on various platforms.


(nia)
diff -r1.9 -r1.10 pkgsrc/devel/stfl/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/stfl/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/stfl/patches/patch-ab
cvs diff -r1.9 -r1.10 pkgsrc/devel/stfl/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/stfl/Makefile 2022/06/28 11:33:43 1.9
+++ pkgsrc/devel/stfl/Makefile 2023/07/09 15:16:33 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2022/06/28 11:33:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2023/07/09 15:16:33 nia Exp $
2 2
3DISTNAME= stfl-0.24 3DISTNAME= stfl-0.24
4PKGREVISION= 7 4PKGREVISION= 8
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://www.clifford.at/stfl/ 6MASTER_SITES= http://www.clifford.at/stfl/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.clifford.at/stfl/ 9HOMEPAGE= http://www.clifford.at/stfl/
10COMMENT= Library which implements a curses-based widget set for text terminals 10COMMENT= Library which implements a curses-based widget set for text terminals
11LICENSE= gnu-lgpl-v3 11LICENSE= gnu-lgpl-v3
12 12
13NO_CONFIGURE= yes 13NO_CONFIGURE= yes
14USE_TOOLS+= gmake perl 14USE_TOOLS+= gmake perl
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_CURSES= wide 16USE_CURSES= wide
17 17
cvs diff -r1.4 -r1.5 pkgsrc/devel/stfl/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/stfl/distinfo 2021/10/26 10:19:57 1.4
+++ pkgsrc/devel/stfl/distinfo 2023/07/09 15:16:33 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2021/10/26 10:19:57 nia Exp $ 1$NetBSD: distinfo,v 1.5 2023/07/09 15:16:33 nia Exp $
2 2
3BLAKE2s (stfl-0.24.tar.gz) = b5a87ea81ba698267b63233ee9e4d8fbcd7ddaede00fede2953f678fbac15e6d 3BLAKE2s (stfl-0.24.tar.gz) = b5a87ea81ba698267b63233ee9e4d8fbcd7ddaede00fede2953f678fbac15e6d
4SHA512 (stfl-0.24.tar.gz) = 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0 4SHA512 (stfl-0.24.tar.gz) = 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
5Size (stfl-0.24.tar.gz) = 45585 bytes 5Size (stfl-0.24.tar.gz) = 45585 bytes
6SHA1 (patch-aa) = d7da2b2e561bc972a7ac976a9deb48805ed4a090 6SHA1 (patch-aa) = d7da2b2e561bc972a7ac976a9deb48805ed4a090
7SHA1 (patch-ab) = 8577547eed804983f4c09028bc4fc48e8f73661d 7SHA1 (patch-ab) = 195190daeb0acf3c210c00a58be38a18b5c74a87
8SHA1 (patch-ac) = dfaa67b489463ff4758161ffbf4bccad510f0d7f 8SHA1 (patch-ac) = dfaa67b489463ff4758161ffbf4bccad510f0d7f
9SHA1 (patch-ad) = 3a92ae825c02ced62802630ca82affedeab88a03 9SHA1 (patch-ad) = 3a92ae825c02ced62802630ca82affedeab88a03
cvs diff -r1.2 -r1.3 pkgsrc/devel/stfl/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/stfl/patches/patch-ab 2016/06/07 17:57:11 1.2
+++ pkgsrc/devel/stfl/patches/patch-ab 2023/07/09 15:16:33 1.3
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-ab,v 1.2 2016/06/07 17:57:11 joerg Exp $ 1$NetBSD: patch-ab,v 1.3 2023/07/09 15:16:33 nia Exp $
2 2
3libtoolify. 3libtoolify.
4 4
5--- Makefile.orig 2015-02-12 13:14:33.000000000 +0000 5--- Makefile.orig 2015-02-12 13:14:33.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -20,26 +20,23 @@ 7@@ -20,26 +20,23 @@
8  8
9 include Makefile.cfg 9 include Makefile.cfg
10  10
11-export CC = gcc -pthread 11-export CC = gcc -pthread
12-export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC 12-export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
13-export LDLIBS += -lncursesw 13-export LDLIBS += -lncursesw
14+export CFLAGS += -I. -Wall -D_GNU_SOURCE -pthread 14+export CFLAGS += -I. -Wall -D_GNU_SOURCE -pthread
15+export LDLIBS += ${CURSES_LIB} 15+export LDLIBS += ${LDFLAGS} ${CURSES_LIB}
16  16
17-SONAME := libstfl.so.0 17-SONAME := libstfl.so.0
18-VERSION := 0.24 18-VERSION := 0.24
19+.SUFFIXES: .c .lo 19+.SUFFIXES: .c .lo
20  20
21-all: libstfl.so.$(VERSION) libstfl.a example 21-all: libstfl.so.$(VERSION) libstfl.a example
22+.c.lo: 22+.c.lo:
23+ libtool --mode=compile ${CC} -o $@ -c ${CFLAGS} $< 23+ libtool --mode=compile ${CC} -o $@ -c ${CFLAGS} $<
24+ 24+
25+all: libstfl.la 25+all: libstfl.la
26  26
27 example: libstfl.a example.o 27 example: libstfl.a example.o
28  28