svn commit: r351052 - in head/net/csocks: . files

[Emanuel Haupt]

Author: ehaupt
Date: Fri Apr 11 21:54:45 2014
New Revision: 351052
URL: http://svnweb.freebsd.org/changeset/ports/351052
QAT: https://qat.redports.org/buildarchive/r351052/

Log:
  - Support staging
  - Use proper INSTALL_* macros instead of CP
  - Respect CC and therefore fix build with clang
  - Respect CFLAGS

Added:
  head/net/csocks/files/patch-Makefile   (contents, props changed)
Modified:
  head/net/csocks/Makefile

Modified: head/net/csocks/Makefile
==============================================================================
--- head/net/csocks/Makefile	Fri Apr 11 21:45:55 2014	(r351051)
+++ head/net/csocks/Makefile	Fri Apr 11 21:54:45 2014	(r351052)
@@ -11,24 +11,19 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	raffaele.delorenzo at libero.it
 COMMENT=	SOCKS Client v4/v5 RFC Compliant with many features
 
-PLIST_FILES=	etc/csocks.conf.sample lib/libcsocks.so lib/libcsocks.so.1 bin/csocks
+PLIST_FILES=	etc/csocks.conf.sample lib/libcsocks.so lib/libcsocks.so.1 \
+		bin/csocks man/man1/csocks.1.gz man/man5/csocks.conf.5.gz
 
-WRKSRC=		${WRKDIR}/src
 USE_LDCONFIG=	yes
-MAN1=		csocks.1
-MAN5=		csocks.conf.5
-MANCOMPRESSED=	yes
 
-NO_STAGE=	yes
-post-patch:
-	${REINPLACE_CMD} "s#/usr/local#${PREFIX}#" ${WRKDIR}/src/Makefile
+WRKSRC=		${WRKDIR}/src
 
 do-install:
-	${CP} -p ${WRKDIR}/src/libcsocks.so.1 ${PREFIX}/lib/
-	${LN} -fs ${PREFIX}/lib/libcsocks.so.1 ${PREFIX}/lib/libcsocks.so
-	${CP} -p ${WRKDIR}/freebsd/csocks ${PREFIX}/bin
-	${CP} -p ${WRKDIR}/csocks.conf ${PREFIX}/etc/csocks.conf.sample
-	${CP} -p ${WRKDIR}/man/csocks.1.gz ${MANPREFIX}/man/man1
-	${CP} -p ${WRKDIR}/man/csocks.conf.5.gz ${MANPREFIX}/man/man5
+	${INSTALL_SCRIPT} ${WRKDIR}/freebsd/csocks ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKDIR}/src/libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib
+	${LN} -s libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib/libcsocks.so
+	${INSTALL_DATA} ${WRKDIR}/csocks.conf ${STAGEDIR}${PREFIX}/etc/csocks.conf.sample
+	${INSTALL_MAN} ${WRKDIR}/man/csocks.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/man/csocks.conf.5.gz ${STAGEDIR}${MANPREFIX}/man/man5
 
 .include <bsd.port.mk>

Added: head/net/csocks/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/csocks/files/patch-Makefile	Fri Apr 11 21:54:45 2014	(r351052)
@@ -0,0 +1,15 @@
+--- Makefile.orig	2014-04-11 23:48:26.646982600 +0200
++++ Makefile	2014-04-11 23:49:46.629977600 +0200
+@@ -1,9 +1,9 @@
+ # Compiler/Linker/dynamic linker
+-CC = gcc
+-LD = gcc
++CC ?= gcc
++LD = $(CC)
+ 
+ # flags to compile object files that can be used in a dynamic library
+-CFLAGS = -fPIC -Wall -g -c -O2 -fno-strict-aliasing -pipe -Wall -std=c99 -D'CSOCKS_CONF="/usr/local/etc/csocks.conf"'
++CFLAGS += -fPIC -c -std=c99 -D'CSOCKS_CONF="$(PREFIX)/etc/csocks.conf"'
+ # on some platforms, use '-fpic' instead.
+ 
+ # Flags to create a dynamic library.