1 files changed, 13 insertions, 13 deletions

diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile
index 7c40096de436..ca730773f13c 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	upnp
-PORTVERSION=	1.0.4
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}sdk-${PORTVERSION}
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Universal Plug and Play Software Development Kit
@@ -19,22 +19,22 @@ LIB_DEPENDS=	uuid.1:${PORTSDIR}/sysutils/e2fsprogs
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/upnp
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 MAKEFILE=	makefile
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 NOT_FOR_ARCHS=	sparc64
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MAKE = make,MAKE = ${GMAKE},' \
-		src/genlib/makefile src/makefile
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
-		src/inc/genlib/client_table/client_table.h \
-		src/inc/genlib/http_client/http_client.h \
-		src/inc/genlib/service_table/service_table.h \
-		src/inc/genlib/timer_thread/timer_thread.h \
-		src/upnpdom/domCif.cpp
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' \
-		src/genlib/http_client/http_client.c \
-		src/genlib/net/http/readwrite.cpp
+	@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | \
+		${XARGS} ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,'
+	@${FIND} ${PATCH_WRKSRC} -name "[Mm]akefile" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's,lpthread,pthread, ; s,/usr,,g ; s,1\.2\.1,1,g' \
+		-e 's,MAKE = make,MAKE = ${GMAKE},' \
+		-e 's,install bin,${INSTALL_PROGRAM} bin,g' \
+		-e 's,install inc,${INSTALL_DATA} inc,g'
+	@${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' ${PATCH_WRKSRC}/upnp/src/genlib/net/sock.c
+	@${REINPLACE_CMD} -e 's,linux/if,net/if,' ${PATCH_WRKSRC}/upnp/src/api/upnpapi.c
 
 .include <bsd.port.mk>