diff --git a/misc/trurl/Makefile b/misc/trurl/Makefile index edc78180f0e4..480a09677bf8 100644 --- a/misc/trurl/Makefile +++ b/misc/trurl/Makefile @@ -1,33 +1,34 @@ PORTNAME= trurl DISTVERSIONPREFIX= ${PORTNAME}- -DISTVERSION= 0.12 +DISTVERSION= 0.13 CATEGORIES= misc www MAINTAINER= otis@FreeBSD.org COMMENT= Command line tool for URL parsing and manipulation WWW= https://github.com/curl/trurl LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} -USES= gmake python:test +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" \ +MAKE_ARGS= TRURL_IGNORE_CURL_CONFIG=1 \ + PYTHON3=${PYTHON_CMD} ALL_TARGET= ${PORTNAME} TEST_TARGET= test +LDFLAGS+= -lcurl + PLIST_FILES= bin/trurl \ share/man/man1/trurl.1.gz post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/trurl .include diff --git a/misc/trurl/distinfo b/misc/trurl/distinfo index 43f410b57054..ca1f8dd45a5e 100644 --- a/misc/trurl/distinfo +++ b/misc/trurl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713777138 -SHA256 (curl-trurl-trurl-0.12_GH0.tar.gz) = 67a1620ebb0392a9cdd8e46bc44a14e0a5d8c1a9112859fbbb525ec919d2fa9b -SIZE (curl-trurl-trurl-0.12_GH0.tar.gz) = 45860 +TIMESTAMP = 1715802848 +SHA256 (curl-trurl-trurl-0.13_GH0.tar.gz) = 8ceeb09d0e08dc677897f26651aa625d9ad18021f881f9d5f31e5a95bb3cc047 +SIZE (curl-trurl-trurl-0.13_GH0.tar.gz) = 46408 diff --git a/misc/trurl/files/patch-Makefile b/misc/trurl/files/patch-Makefile deleted file mode 100644 index 40ba35efd866..000000000000 --- a/misc/trurl/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- 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