Index: head/irc/hexchat/Makefile =================================================================== --- head/irc/hexchat/Makefile (revision 363618) +++ head/irc/hexchat/Makefile (revision 363619) @@ -1,135 +1,135 @@ # Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= hexchat PORTVERSION= 2.9.6.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= irc gnome ipv6 MASTER_SITES= http://dl.hexchat.org/${PORTNAME}/ MAINTAINER= koalative@gmail.com COMMENT= IRC chat program with GTK and Text Frontend LICENSE= GPLv2 LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy USES= gmake desktop-file-utils libtool pkgconfig tar:xz USE_GNOME= gtk20 libxml2 USE_AUTOTOOLS= automake autoconf libtoolize GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-openssl --enable-gtkfe --disable-sysinfo \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP} INSTALLS_ICONS= yes LDFLAGS+= -pthread SUB_FILES= pkg-message PORTDOCS= * OPTIONS_DEFINE= CA_BUNDLE CANBERRA DBUS DOAT DOCS FISHLIM NLS NOTIFY \ PERL PYTHON SOCKS TEXTFE XFT OPTIONS_RADIO= SPELL OPTIONS_RADIO_SPELL= GTKSPELL LIBSEXY STATIC OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY LIBSEXY PERL PYTHON \ SOCKS XFT OPTIONS_SUB= yes CA_BUNDLE_DESC= Include CA bundle for SSL verification CANBERRA_DESC= Audio support via Libcanberra DOAT_DESC= Do At plugin GTKSPELL_DESC= Spell checking support via GTKSpell FISHLIM_DESC= FiSHLiM plugin LIBSEXY_DESC= Spell checking support via Libsexy STATIC_DESC= Spell checking embedded in the binary TEXTFE_DESC= Text frontend CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss CANBERRA_LIB_DEPENDS= libcanberra.so:${PORTSDIR}/audio/libcanberra CANBERRA_CONFIGURE_ENABLE= libcanberra DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib DBUS_CONFIGURE_ENABLE= dbus DOAT_CONFIGURE_ENABLE= doat FISHLIM_CONFIGURE_ENABLE= fishlim NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NOTIFY_RUN_DEPENDS= notify-send:${PORTSDIR}/devel/libnotify NOTIFY_CONFIGURE_ENABLE= libnotify PERL_CONFIGURE_ENABLE= perl PYTHON_CONFIGURE_ENABLE= python SOCKS_LIB_DEPENDS= libsocks.so:${PORTSDIR}/net/dante SOCKS_CONFIGURE_ENABLE= socks TEXTFE_CONFIGURE_ENABLE= textfe XFT_CONFIGURE_ENABLE= xft GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell LIBSEXY_LIB_DEPENDS= libsexy.so:${PORTSDIR}/x11-toolkits/libsexy # Wrong versioning upstream PORTSCOUT= skipv:2.10.0 .include .if ! ${PORT_OPTIONS:MGTKSPELL} && ! ${PORT_OPTIONS:MLIBSEXY} && ! ${PORT_OPTIONS:MSTATIC} CONFIGURE_ARGS+=--enable-spell=none .endif .if ${PORT_OPTIONS:MGTKSPELL} CONFIGURE_ARGS+=--enable-spell=gtkspell .endif .if ${PORT_OPTIONS:MLIBSEXY} CONFIGURE_ARGS+=--enable-spell=libsexy .endif .if ${PORT_OPTIONS:MSTATIC} CONFIGURE_ARGS+=--enable-spell=static .endif .if ${PORT_OPTIONS:MCA_BUNDLE} CA_BUNDLE= "${LOCALBASE}/share/certs/ca-root-nss.crt" .else CA_BUNDLE= NULL .endif .if ${PORT_OPTIONS:MXFT} USE_XORG+= xft .endif .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes .endif .if ${PORT_OPTIONS:MPERL} USES+= perl5 .endif .if ${PORT_OPTIONS:MDBUS} USE_GNOME+= gconf2 .endif post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' ${WRKSRC}/autogen.sh @${REINPLACE_CMD} -e '/^appdata_DATA/s|hexchat.appdata.xml||' \ ${WRKSRC}/share/misc/Makefile.am ${WRKSRC}/share/misc/Makefile.in @${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \ ${WRKSRC}/src/common/server.c pre-configure: @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh) post-install: ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/share/doc/*.md ${STAGEDIR}${DOCSDIR} .endif # @(cd ${PREFIX}/lib/hexchat/plugins/ && ${RM} -f *.a) .include Index: head/net/dante/Makefile =================================================================== --- head/net/dante/Makefile (revision 363618) +++ head/net/dante/Makefile (revision 363619) @@ -1,44 +1,55 @@ # Created by: Anders Nordby # $FreeBSD$ PORTNAME= dante -PORTVERSION= 1.3.2 -CATEGORIES= net security +PORTVERSION= 1.4.0 +CATEGORIES= net security ipv6 MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ \ http://atreides.freenix.no/~anders/ \ ftp://ftp.inet.no/pub/socks/old/ MAINTAINER= anders@FreeBSD.org COMMENT= Circuit-level firewall/proxy +LICENSE= BSD + CONFLICTS= socks5-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ --with-sockd-conf=${PREFIX}/etc/sockd.conf CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib +USES= libtool USE_LDCONFIG= yes - USE_RC_SUBR= sockd -LICENSE= BSD +OPTIONS_DEFINE= DOCS EXAMPLES -MAN1= socksify.1 -MAN5= sockd.conf.5 socks.conf.5 -MAN8= sockd.8 +.include -NO_STAGE= yes -post-install: - @${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${PREFIX}/etc/socks.conf.example - @${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${PREFIX}/etc/sockd.conf.example -.if !defined(NOPORTDOCS) - ${INSTALL} -d -m 555 ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/README* ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${DOCSDIR} +.if ${OSVERSION} >= 1000044 +CONFIGURE_ARGS+= --with-libc=libc.so.7 .endif -.include +.include + +post-install: + ${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${STAGEDIR}${PREFIX}/etc/socks.conf.sample + ${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${STAGEDIR}${PREFIX}/etc/sockd.conf.sample + ${INSTALL} -d -m 555 ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/example/sockd-basic.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/example/sockd-chaining.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/example/socks-simple-withoutnameserver.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/example/socks-simple.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL} -d -m 555 ${STAGEDIR}${DOCSDIR} + ${INSTALL} -d -m 555 ${STAGEDIR}${DOCSDIR}/contrib + ${INSTALL_DATA} ${WRKSRC}/doc/README* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/UPGRADE ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/sockd-stat.awk ${STAGEDIR}${DOCSDIR}/contrib/sockd-stat.awk + +.include Index: head/net/dante/distinfo =================================================================== --- head/net/dante/distinfo (revision 363618) +++ head/net/dante/distinfo (revision 363619) @@ -1,2 +1,2 @@ -SHA256 (dante-1.3.2.tar.gz) = 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb -SIZE (dante-1.3.2.tar.gz) = 949049 +SHA256 (dante-1.4.0.tar.gz) = 55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b +SIZE (dante-1.4.0.tar.gz) = 1253458 Index: head/net/dante/files/patch-configure =================================================================== --- head/net/dante/files/patch-configure (revision 363618) +++ head/net/dante/files/patch-configure (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig 2011-06-20 18:01:06.000000000 +0200 -+++ configure 2011-07-12 15:49:45.602728013 +0200 -@@ -33876,7 +33876,7 @@ - - - --for ac_header in gssapi.h gssapi/gssapi.h gssapi/gssapi_ext.h -+for ac_header in gssapi/gssapi.h gssapi/gssapi_ext.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then Property changes on: head/net/dante/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/dante/files/patch-ltmain.sh =================================================================== --- head/net/dante/files/patch-ltmain.sh (revision 363618) +++ head/net/dante/files/patch-ltmain.sh (nonexistent) @@ -1,15 +0,0 @@ ---- ltmain.sh.orig 2008-08-12 19:06:26.000000000 +0200 -+++ ltmain.sh 2011-07-12 16:01:37.595732703 +0200 -@@ -6115,10 +6115,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $extra_mode $instname $destdir/$name" - $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" Property changes on: head/net/dante/files/patch-ltmain.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/dante/pkg-message =================================================================== --- head/net/dante/pkg-message (nonexistent) +++ head/net/dante/pkg-message (revision 363619) @@ -0,0 +1,12 @@ + +******************* IMPORTANT UPGRADE NOTIFICATION ******************* + +If you're upgrading from earlier release to 1.4.x, please read UPGRADE +document, which is installed in docs folder, or check it online: + +http://www.inet.no/dante/doc/1.4.x/config/upgrade.html + +The 1.4.x release has syntax changes and various new functionality +additions. + +******************* IMPORTANT UPGRADE NOTIFICATION ******************* Property changes on: head/net/dante/pkg-message ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/dante/pkg-plist =================================================================== --- head/net/dante/pkg-plist (revision 363618) +++ head/net/dante/pkg-plist (revision 363619) @@ -1,19 +1,32 @@ @unexec %D/etc/rc.d/sockd.sh forcestop 2>/dev/null || true bin/socksify -etc/sockd.conf.example -etc/socks.conf.example +@sample etc/sockd.conf.sample +@sample etc/socks.conf.sample include/socks.h lib/libdsocks.so lib/libsocks.a lib/libsocks.so -lib/libsocks.so.1 +lib/libsocks.so.0 +lib/libsocks.so.0.1.1 sbin/sockd +man/man1/socksify.1.gz +man/man5/sockd.conf.5.gz +man/man5/socks.conf.5.gz +man/man8/sockd.8.gz +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-basic.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-chaining.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks-simple-withoutnameserver.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks-simple.conf +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% %%PORTDOCS%%%%DOCSDIR%%/README.socksify %%PORTDOCS%%%%DOCSDIR%%/README.survey %%PORTDOCS%%%%DOCSDIR%%/README.usage %%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol %%PORTDOCS%%%%DOCSDIR%%/SOCKS4A.protocol +%%PORTDOCS%%%%DOCSDIR%%/UPGRADE +%%PORTDOCS%%%%DOCSDIR%%/contrib/sockd-stat.awk %%PORTDOCS%%%%DOCSDIR%%/rfc1928.txt %%PORTDOCS%%%%DOCSDIR%%/rfc1929.txt %%PORTDOCS%%%%DOCSDIR%%/rfc1961.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib %%PORTDOCS%%@dirrm %%DOCSDIR%%