diff --git a/japanese/proxy2ch/Makefile b/japanese/proxy2ch/Makefile index a70013a8de39..dc4236eaedac 100644 --- a/japanese/proxy2ch/Makefile +++ b/japanese/proxy2ch/Makefile @@ -1,46 +1,47 @@ PORTNAME= proxy2ch DISTVERSION= 20250614 +PORTREVISION= 1 CATEGORIES= japanese www -MASTER_SITES= ${WWW}archive/ +MASTER_SITES= https://codeberg.org/NanashiNoGombe/${PORTNAME}/archive/v${DISTVERSION}${EXTRACT_SUFX}?dummy=/ DISTNAME= v${DISTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= mew14930xvi@inbox.lv COMMENT= Proxy server for 5ch.net, bbspink.com and talk.jp WWW= https://codeberg.org/NanashiNoGombe/proxy2ch/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl USES= gmake iconv:wchar_t localbase:ldflags ssl USE_RC_SUBR= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} PLIST_FILES= ${DOCSDIR_REL}/README.md sbin/${PORTNAME} OPTIONS_DEFINE= LUA MITM MITM_DESC= Operates as a MITM proxy (experimental) LUA_USES= lua LUA_CFLAGS= -DUSE_LUA LUA_LDFLAGS= -llua-${LUA_VER} MITM_CFLAGS= -DUSE_MITM -DUSE_ECDSA_KEY MITM_LDFLAGS= -lssl post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} post-patch-LUA-on: @cd ${WRKSRC} && ${REINPLACE_CMD} \ -e '/include/s,lua.hpp,${LUA_FLAVOR}/lua.hpp,' \ BBS2chProxyHttpHeaders.h BBS2chProxyPoster.cpp main.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include diff --git a/japanese/proxy2ch/files/patch-Makefile b/japanese/proxy2ch/files/patch-Makefile index 72a5e3432b3e..36e18a7c12ad 100644 --- a/japanese/proxy2ch/files/patch-Makefile +++ b/japanese/proxy2ch/files/patch-Makefile @@ -1,31 +1,30 @@ ---- Makefile.orig 2025-06-04 17:25:57 UTC +--- Makefile.orig 2025-06-14 10:42:42 UTC +++ Makefile -@@ -3,26 +3,8 @@ OBJS := $(OBJS:.c=.o) +@@ -3,26 +3,7 @@ OBJS := $(OBJS:.c=.o) OBJS = $(SOURCES:.cpp=.o) OBJS := $(OBJS:.c=.o) -CFLAGS = -O2 -LDFLAGS = -lcurl -lpthread - -UNAME := $(shell uname) -HAVE_GNUTLS := $(shell pkg-config --libs gnutls >/dev/null 2>&1; echo $$?) -NOT_GLIBC := $(shell $(CC) -E -dM stringEncodingConverter.c | grep __GNU_LIBRARY__; echo $$?) - -ifneq ($(UNAME), Darwin) - ifeq ($(NOT_GLIBC), 1) - LDFLAGS += -liconv - endif - ifeq ($(HAVE_GNUTLS), 0) - CFLAGS += -DUSE_GNUTLS - LDFLAGS += -lgnutls - else - LDFLAGS += -lcrypto - endif -else - LDFLAGS += -framework CoreFoundation -endif -+CFLAGS += -flto +LDFLAGS += -lcurl -lpthread -liconv -lcrypto .PHONY: all all : $(TARGET)