- Update to 1.0.

- Take maintainership.

3 files changed, 11 insertions, 64 deletions

diff --git a/sysutils/ucspi-unix/Makefile b/sysutils/ucspi-unix/Makefile
index ba68120eb4c5..ffcd20eacae7 100644
--- a/sysutils/ucspi-unix/Makefile
+++ b/sysutils/ucspi-unix/Makefile
@@ -2,22 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	ucspi-unix
-PORTVERSION=	0.36
-PORTREVISION=	5
+PORTVERSION=	1.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/archive/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Unix-domain socket client-server command-line tools
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${BGLIBS_LIB}/libbg.a:devel/bglibs
 
+USES=		libtool:build localbase:ldflags
 BGLIBS_INC=	${LOCALBASE}/include/bglibs
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
-CFLAGS+=	-I${BGLIBS_INC}
-LDFLAGS+=	-L${BGLIBS_LIB}
 
 PLIST_FILES=	bin/unixcat bin/unixclient bin/unixserver \
 		man/man1/unixclient.1.gz man/man1/unixserver.1.gz
@@ -37,7 +35,11 @@ post-patch: .SILENT
 	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-bglibs
 
 do-install:
-	cd ${WRKSRC} && ./installer
+	${INSTALL_SCRIPT} ${WRKSRC}/unixcat ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/unixclient ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/unixserver ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/unixclient.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/unixserver.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/ucspi-unix/distinfo b/sysutils/ucspi-unix/distinfo
index 39718f16df34..33d363c728d0 100644
--- a/sysutils/ucspi-unix/distinfo
+++ b/sysutils/ucspi-unix/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ucspi-unix-0.36.tar.gz) = 428d23fcc91b4dd66f64932978cd26316b82d2599cff7a512690ff1ec9df02e2
-SIZE (ucspi-unix-0.36.tar.gz) = 14175
+TIMESTAMP = 1490366497
+SHA256 (ucspi-unix-1.0.tar.gz) = 5a1a19f891668ff041fc16a4bf77abeb3cb4380cdaab6ffae5a7f89ab599dd37
+SIZE (ucspi-unix-1.0.tar.gz) = 17391
diff --git a/sysutils/ucspi-unix/files/patch-Makefile b/sysutils/ucspi-unix/files/patch-Makefile
deleted file mode 100644
index 1c121fd9e8f9..000000000000
--- a/sysutils/ucspi-unix/files/patch-Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.orig	2002-06-11 05:12:06.000000000 +0800
-+++ Makefile	2013-07-19 22:55:35.000000000 +0800
-@@ -19,8 +19,7 @@
- 	  echo 'source=$$1; shift'; \
- 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
- 	  echo exec `head -1 conf-cc` '-I. -o $${base}.o -c $$source $${1+"$$@"}'; \
--	) >compile
--	chmod 755 compile
-+	) >compile && chmod 755 compile
- 
- conf_bin.c: conf-bin
- 	head -1 conf-bin | \
-@@ -38,37 +37,31 @@
- 	./compile env.c
- 
- installer: load insthier.o
--	./load insthier -linstaller
--	mv insthier installer
-+	./load insthier -linstaller && mv insthier installer
- 
- instcheck: load insthier.o
--	./load insthier -linstcheck
--	mv insthier instcheck
-+	./load insthier -linstcheck && mv insthier instcheck
- 
- insthier.o: compile insthier.c conf_bin.c conf_man.c
- 	./compile insthier.c
- 
- instshow: load insthier.o
--	./load insthier -linstshow
--	mv insthier instshow
-+	./load insthier -linstshow && mv insthier instshow
- 
- load: conf-ld
- 	( echo '#!/bin/sh';\
- 	  echo 'main="$$1"; shift';\
- 	  echo exec `head -1 conf-ld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\
--	) >load
--	chmod 755 load
-+	) >load && chmod 755 load
- 
- programs: unixclient unixserver unixcat
- 
- socket.lib: compile load trylib.c
- 	( ( ./compile trylib.c && ./load trylib -lsocket -lnsl ) >/dev/null 2>&1 \
--	  && echo -lsocket -lnsl || exit 0 ) >socket.lib
--	rm -f trylib.o trylib
-+	  && echo -lsocket -lnsl || exit 0 ) >socket.lib && rm -f trylib.o trylib
- 
- unixcat: warn-auto.sh unixcat.sh
--	cat warn-auto.sh unixcat.sh >unixcat
--	chmod 755 unixcat
-+	cat warn-auto.sh unixcat.sh >unixcat && chmod 755 unixcat
- 
- unixclient: load unixclient.o env.o utoa.o socket.lib
- 	./load unixclient env.o utoa.o `cat socket.lib`