svn commit: r394292 - head/comms/syncterm

[Dmitry Marakasov]

* Stephen Hurd (shurd at FreeBSD.org) wrote:

> Author: shurd
> Date: Sat Aug 15 10:33:03 2015
> New Revision: 394292
> URL: https://svnweb.freebsd.org/changeset/ports/394292
> 
> Log:
>   Update to version 1.0
>   
>   Clean up Makefile to use new options format
>   Remove incorrect INSTALLS_ICONS usage

FYI, this does not build with ccache, likely because it does not
preserver environment:

https://people.freebsd.org/~amdmi3/syncterm.log

> Modified:
>   head/comms/syncterm/Makefile
>   head/comms/syncterm/distinfo
> 
> Modified: head/comms/syncterm/Makefile
> ==============================================================================
> --- head/comms/syncterm/Makefile	Sat Aug 15 10:27:29 2015	(r394291)
> +++ head/comms/syncterm/Makefile	Sat Aug 15 10:33:03 2015	(r394292)
> @@ -2,63 +2,43 @@
>  # $FreeBSD$
>  
>  PORTNAME=	syncterm
> -PORTVERSION=	0.9.${PORTVER}
> -PORTREVISION=	2
> +PORTVERSION=	1.0
>  CATEGORIES=	comms
> -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9.5
> -DISTNAME=	syncterm-src-${PORTVER}
> +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>  
>  MAINTAINER=	shurd at FreeBSD.org
>  COMMENT=	ANSI-BBS terminal which supports telnet, rlogin, and SSH
>  
>  LICENSE=	GPLv2
>  
> -WRKSRC=		${WRKDIR}/syncterm-${PORTVER}/src/syncterm
> +WRKSRC=		${WRKDIR}/syncterm-${PORTVERSION}/src/syncterm
>  USES=		gmake tar:tgz
>  MAKEFILE=	GNUmakefile
> -MAKE_ARGS+=	DONT_CLOBBER_CC=please
> -PORTVER=	20140603
> -INSTALLS_ICONS=	yes
>  PLIST_FILES=	bin/syncterm \
>  		man/man1/syncterm.1.gz \
>  		share/applications/syncterm.desktop \
>  		share/icons/hicolor/64x64/apps/syncterm.png
>  
> +DISABLE_MAKE_JOBS=	yes
> +MAKE_ARGS+=	WITHOUT_PORTAUDIO=yes
> +MAKE_ARGS+=	-C ${WRKSRC}
> +MAKE_ARGS+=	PREFIX="${PREFIX}"
> +MAKE_ARGS+=	INSTALL_EXE="${INSTALL_PROGRAM}"
> +
>  OPTIONS_DEFINE=	X11 SDL DEBUG
>  OPTIONS_DEFAULT=	X11 SDL
>  
> -.include <bsd.port.options.mk>
> +X11_USE=	xorg=x11
> +X11_MAKE_ARGS_OFF=	NO_X=1
>  
> -ONLY_FOR_ARCHS=		i386 amd64
> -ONLY_FOR_ARCHS_REASON=	does not configure except on i386 amd64
> +SDL_USE=	SDL=sdl
> +SDL_MAKE_ARGS=	USE_SDL=1
> +SDL_MAKE_ARGS_OFF=	WITHOUT_SDL=1
>  
> -.if ${ARCH} == "i386" || ${ARCH} == "amd64"
> - LIB_DEPENDS+=	libcl.so:${PORTSDIR}/security/cryptlib
> - MAKE_ARGS+=	CRYPTLIBINCLUDE=${LOCALBASE}/include
> - MAKE_ARGS+=	CRYPTLIBDIR=${LOCALBASE}/lib
> -.else
> - MAKE_ARGS+=	WITHOUT_CRYPTLIB=yes
> -.endif
> -MAKE_ARGS+=	WITHOUT_PORTAUDIO=yes
> -MAKE_ARGS+=	-C ${WRKSRC}
> -MAKE_ARGS+=	PREFIX="${PREFIX}"
> -MAKE_ARGS+=	INSTALL_EXE="${INSTALL_PROGRAM}"
> -.if ${PORT_OPTIONS:MX11}
> -USE_XORG=	x11
> -.else
> -MAKE_ARGS+=	NO_X=1
> -.endif
> -.if ${PORT_OPTIONS:MSDL}
> -USE_SDL=	sdl
> -MAKE_ARGS+=	USE_SDL=1
> -.endif
> -.if ${PORT_OPTIONS:MDEBUG}
> -MAKE_ARGS+=	DEBUG=1
> -.else
> -MAKE_ARGS+=	RELEASE=1
> -.endif
> +DEBUG_MAKE_ARGS=	DEBUG=1
> +DEBUG_MAKE_ARGS_OFF=	RELEASE=1
>  
> -pre-build:
> -	if ( nm -D ${LOCALBASE}/lib/libcl.so | ${GREP} 'U __stack_chk_fail_local' ) then echo "LDFLAGS+=-fstack-protector" >> ${WRKSRC}/localdefs.mk ; fi
> +ONLY_FOR_ARCHS=		i386 amd64
> +ONLY_FOR_ARCHS_REASON=	does not configure except on i386 amd64
>  
>  .include <bsd.port.mk>
> 
> Modified: head/comms/syncterm/distinfo
> ==============================================================================
> --- head/comms/syncterm/distinfo	Sat Aug 15 10:27:29 2015	(r394291)
> +++ head/comms/syncterm/distinfo	Sat Aug 15 10:33:03 2015	(r394292)
> @@ -1,2 +1,2 @@
> -SHA256 (syncterm-src-20140603.tgz) = 6ef3a36ab1c106b7f1a390630d937f63371b3806243cfe49dee5658ad230db7e
> -SIZE (syncterm-src-20140603.tgz) = 8153746
> +SHA256 (syncterm-1.0.tgz) = e77f28580b22b6ea077ab377be15a35b5a965adb731cec9a71573647fe824b37
> +SIZE (syncterm-1.0.tgz) = 8310619
> 
> 

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3 at amdmi3.ru  ..:  jabber: amdmi3 at jabber.ru      http://amdmi3.ru