Attachment #147825 for bug #194031

Lines 1-7 Link Here

(-)net/miniupnpc/Makefile (-2 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= miniupnpc	3	PORTNAME= miniupnpc
4	PORTVERSION= 1.8	4	PORTVERSION= 1.9.20140911
5	CATEGORIES?= net	5	CATEGORIES?= net
6	MASTER_SITES= http://miniupnp.free.fr/files/	6	MASTER_SITES= http://miniupnp.free.fr/files/
7		7
Lines 16-22 HAS_CONFIGURE= yes Link Here
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17		17
18	CONFIGURE_SCRIPT= updateminiupnpcstrings.sh	18	CONFIGURE_SCRIPT= updateminiupnpcstrings.sh
19	MAKE_ENV+= INSTALLPREFIX=${STAGEDIR}${PREFIX}	19	MAKE_ENV+= INSTALLPREFIX="${PREFIX}"
20		20
21	.include <bsd.port.pre.mk>	21	.include <bsd.port.pre.mk>
22		22
Lines 26-31 CFLAGS+= -DDEBUG Link Here
26		26
27	.if ${SLAVE_PORT} == no	27	.if ${SLAVE_PORT} == no
28	USE_RC_SUBR= miniupnpc	28	USE_RC_SUBR= miniupnpc
		29
		30	post-install:
		31	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upnpc \
		32	${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.10
29	.endif	33	.endif
30		34
31	.include <bsd.port.post.mk>	35	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)net/miniupnpc/distinfo (-2 / +2 lines)
1	SHA256 (miniupnpc-1.8.tar.gz) = bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c	1	SHA256 (miniupnpc-1.9.20140911.tar.gz) = 7435bebfdd8c76127136f733979ad2ab56999d204176a1044293536f2e20b21c
2	SIZE (miniupnpc-1.8.tar.gz) = 70624	2	SIZE (miniupnpc-1.9.20140911.tar.gz) = 76855




 CFLAGS += -ansi
 # -DNO_GETADDRINFO
 INSTALL = install
@@ -80,7 +80,7 @@
   SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib
   CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS)
 else
-ifeq ($(OS), Linux)
+ifeq ($(OS), FreeBSD)
   SHAREDLIBRARY = libminiupnpc.so
   SONAME = $(SHAREDLIBRARY).$(APIVERSION)
 endif
@@ -110,13 +110,11 @@
 TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
 endif

Lines 11-16 include/miniupnpc/upnpreplyparse.h Link Here

(-)net/miniupnpc/pkg-plist (-2 / +1 lines)
11	include/miniupnpc/upnperrors.h	11	include/miniupnpc/upnperrors.h
12	lib/libminiupnpc.a	12	lib/libminiupnpc.a
13	lib/libminiupnpc.so	13	lib/libminiupnpc.so
14	lib/libminiupnpc.so.9	14	lib/libminiupnpc.so.10
15	man/man3/miniupnpc.3.gz	15	man/man3/miniupnpc.3.gz
16	@dirrm include/miniupnpc

Lines 23-26 post-patch: Link Here

(-)net/py-miniupnpc/Makefile (+3 lines)
23	@${REINPLACE_CMD} 's/$version$="[^"]*"/\1="${PORTVERSION}"/' \	23	@${REINPLACE_CMD} 's/$version$="[^"]*"/\1="${PORTVERSION}"/' \
24	${WRKSRC}/setup.py	24	${WRKSRC}/setup.py
25		25
		26	post-install:
		27	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so
		28
26	.include "${MASTERDIR}/Makefile"	29	.include "${MASTERDIR}/Makefile"

Return to bug 194031

Lines 9-23 Link Here

(-)net/miniupnpc/files/patch-Makefile (-9 lines)
9	CFLAGS += -ansi	9	CFLAGS += -ansi
10	# -DNO_GETADDRINFO	10	# -DNO_GETADDRINFO
11	INSTALL = install	11	INSTALL = install
12	@@ -80,7 +80,7 @@
13	SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib
14	CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS)
15	else
16	-ifeq ($(OS), Linux)
17	+ifeq ($(OS), FreeBSD)
18	SHAREDLIBRARY = libminiupnpc.so
19	SONAME = $(SHAREDLIBRARY).$(APIVERSION)
20	endif
21	@@ -110,13 +110,11 @@	12	@@ -110,13 +110,11 @@
22	TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o	13	TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
23	endif	14	endif

Lines 23-26 post-patch: Link Here

(-)net/py-miniupnpc/Makefile (+3 lines)
23	@${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \	23	@${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \
24	${WRKSRC}/setup.py	24	${WRKSRC}/setup.py
25		25
		26	post-install:
		27	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so
		28
26	.include "${MASTERDIR}/Makefile"	29	.include "${MASTERDIR}/Makefile"