On 2024/02/21 16:42, Stuart Henderson wrote:
> I don't use these, but noticed they were really old. Anyone using them
> want to give them a spin?
Now that I've built all ports depending on these, I see libnatpmp has a
problem upstream where a required header isn't installed. Here's a fixed
patchset (also simpler, using the cmake build infrastructure, which
lets us remove some patches).
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/net/miniupnp/Makefile.inc,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.inc
--- Makefile.inc 27 Sep 2023 14:18:19 -0000 1.11
+++ Makefile.inc 22 Feb 2024 11:41:39 -0000
@@ -5,7 +5,7 @@ HOMEPAGE= https://miniupnp.tuxfamily.org
# BSD
PERMIT_PACKAGE= Yes
-.if !defined(GH_ACCOUNT)
+.if !defined(GH_ACCOUNT) && !defined(DIST_TUPLE)
SITES?= https://miniupnp.tuxfamily.org/files/
.endif
NO_TEST= Yes
Index: libnatpmp/Makefile
===================================================================
RCS file: /cvs/ports/net/miniupnp/libnatpmp/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- libnatpmp/Makefile 11 Mar 2022 19:46:22 -0000 1.13
+++ libnatpmp/Makefile 22 Feb 2024 11:41:39 -0000
@@ -1,28 +1,19 @@
COMMENT = NAT Port Mapping Protocol client library
-DISTNAME = libnatpmp-20150609
-REVISION = 2
+DIST_TUPLE = github miniupnp libnatpmp f2433bec24ca3d3f22a8a7840728a3ac177f94ba .
+DISTNAME = libnatpmp-20240116
+WRKDIST = ${WRKDIR}/libnatpmp-${DIST_TUPLE:M[0-9a-f]*}
SHARED_LIBS = natpmp 0.1
WANTLIB = c
-MAKE_FLAGS = CC="${CC}"
+CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=TRUE
-MAKE_ENV = SHAREDLIB=libnatpmp.so.${LIBnatpmp_VERSION} \
- SONAME=libnatpmp.so.${LIBnatpmp_VERSION}
-
-FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
- INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM_DIR="${INSTALL_PROGRAM_DIR}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALLPREFIX=${WRKINST}${PREFIX}
-
-USE_GMAKE = Yes
+MODULES = devel/cmake
post-install:
- ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/natpmpc.1 \
- ${PREFIX}/man/man1/natpmpc.1
+ #${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/natpmpc.1 ${PREFIX}/man/man1/natpmpc.1
.include <bsd.port.mk>
Index: libnatpmp/distinfo
===================================================================
RCS file: /cvs/ports/net/miniupnp/libnatpmp/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- libnatpmp/distinfo 17 Aug 2017 11:28:00 -0000 1.6
+++ libnatpmp/distinfo 22 Feb 2024 11:41:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnatpmp-20150609.tar.gz) = 4aqcTEIZvAaUPWshMPZk2u4hP7Ji/LlN01WBW49FNrA=
-SIZE (libnatpmp-20150609.tar.gz) = 24392
+SHA256 (miniupnp-libnatpmp-f2433bec24ca3d3f22a8a7840728a3ac177f94ba.tar.gz) = 74SXmVDfs1VnBbY8nNbJVQG3Xoh/ukZiNLGH88kClmk=
+SIZE (miniupnp-libnatpmp-f2433bec24ca3d3f22a8a7840728a3ac177f94ba.tar.gz) = 28356
Index: libnatpmp/patches/patch-CMakeLists_txt
===================================================================
RCS file: libnatpmp/patches/patch-CMakeLists_txt
diff -N libnatpmp/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libnatpmp/patches/patch-CMakeLists_txt 22 Feb 2024 11:41:39 -0000
@@ -0,0 +1,14 @@
+https://github.com/miniupnp/libnatpmp/pull/39/commits/e654ac0638fd014d6279bafe646f049a95198661
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ install(TARGETS natpmp natpmpc
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+-install(FILES natpmp.h
++install(FILES natpmp.h natpmp_declspec.h
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/natpmp.pc
Index: libnatpmp/patches/patch-Makefile
===================================================================
RCS file: libnatpmp/patches/patch-Makefile
diff -N libnatpmp/patches/patch-Makefile
--- libnatpmp/patches/patch-Makefile 11 Mar 2022 19:46:22 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -5,8 +5,8 @@
- # http://miniupnp.free.fr/libnatpmp.html
-
- OS = $(shell uname -s)
--CC = gcc
--INSTALL = install -p
-+CC ?= cc
-+INSTALL ?= install -p
- ARCH = $(shell uname -m | sed -e s/i.86/i686/)
- VERSION = $(shell cat VERSION)
-
-@@ -49,9 +49,9 @@ ifneq (,$(findstring WIN,$(OS)))
- CC = i686-w64-mingw32-gcc
- EXTRA_LD = -lws2_32 -lIphlpapi -Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc --Wl,kill-at
- else
-- SHAREDLIB = libnatpmp.so
-+ SHAREDLIB ?= libnatpmp.so
- JNISHAREDLIB = libjninatpmp.so
-- SONAME = $(SHAREDLIB).$(APIVERSION)
-+ SONAME ?= $(SHAREDLIB).$(APIVERSION)
- SONAMEFLAGS=-Wl,-soname,$(JNISHAREDLIB)
- endif
- endif
-@@ -92,14 +92,13 @@ depend:
- makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
-
- install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
-- $(INSTALL) -d $(INSTALLDIRINC)
-- $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
-- $(INSTALL) -d $(INSTALLDIRLIB)
-- $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
-- $(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
-- $(INSTALL) -d $(INSTALLDIRBIN)
-- $(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
-- ln -s -f $(SONAME) $(INSTALLDIRLIB)/$(SHAREDLIB)
-+ $(INSTALL_DATA_DIR) $(INSTALLDIRINC)
-+ $(INSTALL_DATA) $(HEADERS) $(INSTALLDIRINC)
-+ $(INSTALL_DATA_DIR) $(INSTALLDIRLIB)
-+ $(INSTALL_DATA) $(STATICLIB) $(INSTALLDIRLIB)
-+ $(INSTALL_DATA) $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
-+ $(INSTALL_PROGRAM_DIR) $(INSTALLDIRBIN)
-+ $(INSTALL_PROGRAM) natpmpc-shared $(INSTALLDIRBIN)/natpmpc
-
- $(JNIHEADERS): fr/free/miniupnp/libnatpmp/NatPmp.class
- $(JAVAH) -jni fr.free.miniupnp.libnatpmp.NatPmp
Index: libnatpmp/patches/patch-declspec_h
===================================================================
RCS file: libnatpmp/patches/patch-declspec_h
diff -N libnatpmp/patches/patch-declspec_h
--- libnatpmp/patches/patch-declspec_h 11 Mar 2022 19:46:22 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
---- declspec.h.orig Tue May 13 12:13:07 2014
-+++ declspec.h Tue May 13 12:13:25 2014
-@@ -9,12 +9,7 @@
- #define LIBSPEC __declspec(dllimport)
-
No comments:
Post a Comment