Index: head/net/socat/Makefile =================================================================== --- head/net/socat/Makefile (revision 563834) +++ head/net/socat/Makefile (revision 563835) @@ -1,54 +1,55 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= socat PORTVERSION= 1.7.4.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.dest-unreach.org/socat/download/ \ LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Multipurpose relay and more LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler cpe ssl tar:bzip2 USE_RC_SUBR= socat GNU_CONFIGURE= yes CPE_VENDOR= dest-unreach PORTSCOUT= skipv:2.0.0-b2 PLIST_FILES= bin/filan bin/procan bin/socat man/man1/socat.1.gz \ "@sample etc/socat-instances.conf.sample" PORTDOCS= EXAMPLES README SECURITY FAQ OPTIONS_DEFINE= DOCS READLINE READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline .include .if ${SSL_DEFAULT} != base CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif .if ${COMPILER_TYPE} == "clang" CFLAGS+= -Wno-unused-comparison .endif do-install: .for f in filan procan socat ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${FILESDIR}/socat-instances.conf.sample ${STAGEDIR}${PREFIX}/etc .include Index: head/net/socat/files/socat-instances.conf.sample =================================================================== --- head/net/socat/files/socat-instances.conf.sample (revision 563834) +++ head/net/socat/files/socat-instances.conf.sample (revision 563835) @@ -1,43 +1,47 @@ # socat-instances.conf.sample # This config file is evaluated by the rc script from the FreeBSD # port of net/socat. # It is not related to socat(1) itself! # This file is shell syntax. # Each instance to be daemonized must be defined with a line starting # with [instancename]. instancename can be any alnum and is case insensitive # (will internally be converted to upper case). -#[ntp4] +#[http4] # Default socat_daemonuser=nobody won't be able to open sockets with port numbers # below 1024. #daemonuser=root -#flags="UDP4-RECVFROM:123,fork,bind=192.0.2.20 UDP4-SENDTO:169.254.0.53:123" +#flags="TCP4-LISTEN:80,fork,bind=192.0.2.3 TCP4:169.254.0.1:80" + +#[ntp4] +#daemonuser=root +#flags="UDP4-RECVFROM:123,fork,bind=192.0.2.3 UDP4-SENDTO:169.254.0.53:123" #[ntp6] #daemonuser=root #flags="UDP6-RECVFROM:123,fork,bind=[2001:DB8::1:2:3] UDP4-SENDTO:169.254.0.53:123" # # Variable definitions: # # daemonuser (optional): # Overrides socat_daemonuser= from rc.conf if defined or the # rc scripts builtin default (nobody). # daemon(8) will run socat as this user. # # pidfile (optional): # If not defined, /var/run/socat_INSTANCENAME.pid will be used # (will be derived from rc script's default, which is /var/run/socat.pid). # # flags (mandatory): # See socat(1). # # service(8)/rc(8) "start" commands will skip instances without flags defined, # while "stop" commands will try to stop any present instance section. # # To control a single instance, you can append one instance name to the # rc(8) command. # Otherwise all uncommented instance definitions in this file will be processed.