Attachment #250125 for bug #278497

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




PORTNAME=	trurl
DISTVERSIONPREFIX=	${PORTNAME}-
DISTVERSION=	0.12
CATEGORIES=	misc www

MAINTAINER=	otis@FreeBSD.org

LIB_DEPENDS=	libcurl.so:ftp/curl
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}

USES=		gmake localbase:ldflags python:test
USE_GITHUB=	yes
GH_ACCOUNT=	curl

MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		LDFLAGS="-lcurl" \
		LDLIBS="-L${LOCALBASE}/lib" \

ALL_TARGET=	${PORTNAME}
TEST_TARGET=	test

LDFLAGS=	-lcurl

MAKE_ARGS=	TRURL_IGNORE_CURL_CONFIG=1 \
		PYTHON3=${PYTHON_CMD}

PLIST_FILES=	bin/trurl \
		share/man/man1/trurl.1.gz


Lines 1-3 Link Here

(-)b/misc/trurl/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1708412466	1	TIMESTAMP = 1713679777
2	SHA256 (curl-trurl-trurl-0.10_GH0.tar.gz) = e54ee05a1a39f2547fbb39225f9cf5e2608eeaf07ad3f7dbff0a069d060d3c46	2	SHA256 (curl-trurl-trurl-0.12_GH0.tar.gz) = 67a1620ebb0392a9cdd8e46bc44a14e0a5d8c1a9112859fbbb525ec919d2fa9b
3	SIZE (curl-trurl-trurl-0.10_GH0.tar.gz) = 45268	3	SIZE (curl-trurl-trurl-0.12_GH0.tar.gz) = 45860




--- Makefile.orig	2024-02-20 07:14:00 UTC
+++ Makefile
@@ -24,10 +24,6 @@ OBJS = trurl.o
 
 TARGET = trurl
 OBJS = trurl.o
-ifndef TRURL_IGNORE_CURL_CONFIG
-LDLIBS += $$(curl-config --libs)
-CFLAGS += $$(curl-config --cflags)
-endif
 CFLAGS += -W -Wall -Wshadow -Werror -pedantic
 CFLAGS += -Wconversion -Wmissing-prototypes -Wwrite-strings -Wsign-compare -Wno-sign-conversion
 ifndef NDEBUG

Return to bug 278497

Lines 1-6 Link Here

(-)b/misc/trurl/Makefile (-6 / +7 lines)
1	PORTNAME= trurl	1	PORTNAME= trurl
2	DISTVERSIONPREFIX= ${PORTNAME}-	2	DISTVERSIONPREFIX= ${PORTNAME}-
3	DISTVERSION= 0.10	3	DISTVERSION= 0.12
4	CATEGORIES= misc www	4	CATEGORIES= misc www
5		5
6	MAINTAINER= otis@FreeBSD.org	6	MAINTAINER= otis@FreeBSD.org
Lines 13-29 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
13	LIB_DEPENDS= libcurl.so:ftp/curl	13	LIB_DEPENDS= libcurl.so:ftp/curl
14	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}	14	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
15		15
16	USES= gmake python:test	16	USES= gmake localbase:ldflags python:test
17	USE_GITHUB= yes	17	USE_GITHUB= yes
18	GH_ACCOUNT= curl	18	GH_ACCOUNT= curl
19		19
20	MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
21	LDFLAGS="-lcurl" \
22	LDLIBS="-L${LOCALBASE}/lib" \
23
24	ALL_TARGET= ${PORTNAME}	20	ALL_TARGET= ${PORTNAME}
25	TEST_TARGET= test	21	TEST_TARGET= test
26		22
		23	LDFLAGS= -lcurl
		24
		25	MAKE_ARGS= TRURL_IGNORE_CURL_CONFIG=1 \
		26	PYTHON3=${PYTHON_CMD}
		27
27	PLIST_FILES= bin/trurl \	28	PLIST_FILES= bin/trurl \
28	share/man/man1/trurl.1.gz	29	share/man/man1/trurl.1.gz
29		30

Removed Link Here

(-)a/misc/trurl/files/patch-Makefile (-13 lines)
1	--- Makefile.orig 2024-02-20 07:14:00 UTC
2	+++ Makefile
3	@@ -24,10 +24,6 @@ OBJS = trurl.o
4
5	TARGET = trurl
6	OBJS = trurl.o
7	-ifndef TRURL_IGNORE_CURL_CONFIG
8	-LDLIBS += $$(curl-config --libs)
9	-CFLAGS += $$(curl-config --cflags)
10	-endif
11	CFLAGS += -W -Wall -Wshadow -Werror -pedantic
12	CFLAGS += -Wconversion -Wmissing-prototypes -Wwrite-strings -Wsign-compare -Wno-sign-conversion
13	ifndef NDEBUG