Index: head/irc/iroffer-dinoex/Makefile =================================================================== --- head/irc/iroffer-dinoex/Makefile (revision 370627) +++ head/irc/iroffer-dinoex/Makefile (revision 370628) @@ -1,79 +1,79 @@ # $FreeBSD$ PORTNAME= iroffer PORTVERSION= 3.29 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc MASTER_SITES= http://iroffer.dinoex.net/ PKGNAMESUFFIX= -dinoex${PKGNAMESUFFIX2} DISTNAME= iroffer-dinoex-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= IRC "bot" that makes sharing files via DCC extremely easy LICENSE= GPLv2 CONFLICTS= iroffer-1* iroffer-lamm-1.* HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= CC="${CC}" LDFLAGS="${LDFLAGS}" LOCALBASE="${LOCALBASE}" ALL_TARGET= all-lang doc USE_RC_SUBR= iroffer-dinoex IROFFER_DOCS= README README.modDinoex LIESMICH.modDinoex \ LICENSE THANKS TODO \ help-admin-de.txt help-admin-en.txt \ help-admin-fr.txt help-admin-it.txt \ doc/iroffer.1.txt doc/iroffer.1.html doc/iroffer.1.ps \ doc/INSTALL-linux-de.html doc/INSTALL-linux-de.txt \ doc/INSTALL-linux-en.html doc/INSTALL-linux-en.txt \ doc/INSTALL-linux-fr.html doc/INSTALL-linux-fr.txt \ doc/INSTALL-linux-it.html doc/INSTALL-linux-it.txt \ doc/INSTALL-vhost-de.html doc/INSTALL-vhost-de.txt \ doc/INSTALL-vhost-en.html doc/INSTALL-vhost-en.txt \ doc/INSTALL-vhost-fr.html doc/INSTALL-vhost-fr.txt IROFFER_EXAMPLES= iroffer.cron \ sample.config beispiel.config exemple.config \ header.html footer.html ruby-sample.rb IROFFER_HTDOCS= iroffer-state.css robots.txt \ info.txt.rb json.txt.rb md5.txt.rb sfv.txt.rb OPTIONS_DEFINE= CURL RUBY UPNP GEOIP DOCS EXAMPLES OPTIONS_DEFAULT=CURL RUBY UPNP GEOIP CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl CURL_CONFIGURE_ON= -curl RUBY_USE= RUBY=yes LIBRUBY=yes RUBY_CONFIGURE_ON= -ruby UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc UPNP_CONFIGURE_ON= -upnp GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP GEOIP_CONFIGURE_ON= -geoip .include do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/iroffer-de ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/iroffer-it ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/iroffer-fr ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/iroffer.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/xdcc.7 ${STAGEDIR}${PREFIX}/man/man7/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${IROFFER_DOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor .endif .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/htdocs .for i in ${IROFFER_HTDOCS} ${INSTALL_DATA} ${WRKSRC}/htdocs/${i} ${STAGEDIR}${EXAMPLESDIR}/htdocs/ .endfor .for i in ${IROFFER_EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/ .endfor .endif .include Index: head/net/miniupnpc/Makefile =================================================================== --- head/net/miniupnpc/Makefile (revision 370627) +++ head/net/miniupnpc/Makefile (revision 370628) @@ -1,31 +1,35 @@ # $FreeBSD$ PORTNAME= miniupnpc -PORTVERSION= 1.8 +PORTVERSION= 1.9 CATEGORIES?= net MASTER_SITES= http://miniupnp.free.fr/files/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= UPnP IGD client lightweight library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake HAS_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_SCRIPT= updateminiupnpcstrings.sh -MAKE_ENV+= INSTALLPREFIX=${STAGEDIR}${PREFIX} +MAKE_ENV+= INSTALLPREFIX=${PREFIX} .include .if defined(WITH_DEBUG) CFLAGS+= -DDEBUG .endif .if ${SLAVE_PORT} == no USE_RC_SUBR= miniupnpc + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upnpc \ + ${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.10 .endif .include Index: head/net/miniupnpc/distinfo =================================================================== --- head/net/miniupnpc/distinfo (revision 370627) +++ head/net/miniupnpc/distinfo (revision 370628) @@ -1,2 +1,2 @@ -SHA256 (miniupnpc-1.8.tar.gz) = bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c -SIZE (miniupnpc-1.8.tar.gz) = 70624 +SHA256 (miniupnpc-1.9.tar.gz) = 2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 +SIZE (miniupnpc-1.9.tar.gz) = 74230 Index: head/net/miniupnpc/files/patch-Makefile =================================================================== --- head/net/miniupnpc/files/patch-Makefile (revision 370627) +++ head/net/miniupnpc/files/patch-Makefile (revision 370628) @@ -1,36 +1,27 @@ ---- Makefile.orig 2013-01-28 12:10:25.000000000 +0200 -+++ Makefile 2013-02-07 15:19:04.788319388 +0200 +--- Makefile.orig 2014-01-31 14:57:23.000000000 +0100 ++++ Makefile 2014-10-07 23:26:17.000000000 +0200 @@ -35,7 +35,7 @@ CFLAGS += -fno-common CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT CFLAGS += -DMINIUPNPC_GET_SRC_ADDR -CFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=1 +CFLAGS += -D_BSD_SOURCE 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 @@ +@@ -117,13 +117,11 @@ TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o endif -LIBDIR ?= lib # install directories -INSTALLPREFIX ?= $(PREFIX)/usr INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc -INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) +INSTALLDIRLIB = $(INSTALLPREFIX)/lib INSTALLDIRBIN = $(INSTALLPREFIX)/bin -INSTALLDIRMAN = $(INSTALLPREFIX)/share/man +INSTALLDIRMAN = $(INSTALLPREFIX)/man FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) ifneq ($(OS), AmigaOS) Index: head/net/miniupnpc/pkg-plist =================================================================== --- head/net/miniupnpc/pkg-plist (revision 370627) +++ head/net/miniupnpc/pkg-plist (revision 370628) @@ -1,16 +1,15 @@ bin/upnpc bin/external-ip include/miniupnpc/declspec.h include/miniupnpc/igd_desc_parse.h include/miniupnpc/miniupnpc.h include/miniupnpc/miniupnpctypes.h include/miniupnpc/miniwget.h include/miniupnpc/portlistingparse.h include/miniupnpc/upnpcommands.h include/miniupnpc/upnpreplyparse.h include/miniupnpc/upnperrors.h lib/libminiupnpc.a lib/libminiupnpc.so -lib/libminiupnpc.so.9 +lib/libminiupnpc.so.10 man/man3/miniupnpc.3.gz -@dirrm include/miniupnpc Index: head/net/py-miniupnpc/Makefile =================================================================== --- head/net/py-miniupnpc/Makefile (revision 370627) +++ head/net/py-miniupnpc/Makefile (revision 370628) @@ -1,26 +1,29 @@ # $FreeBSD$ CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python module for miniupnpc BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/miniupnpc:build MASTERDIR= ${.CURDIR}/../miniupnpc -USE_PYTHON= yes -USE_PYDISTUTILS=yes +USES= python +USE_PYTHON= distutils WRKDIR= ${WRKDIRPREFIX}${MASTERDIR}/work PLIST= ${.CURDIR}/pkg-plist .if exists(${.CURDIR}/Makefile.local) .include "${.CURDIR}/Makefile.local" .endif post-patch: - @${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \ + ${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \ ${WRKSRC}/setup.py + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so .include "${MASTERDIR}/Makefile"