svn commit: r433532 - in head/net/freebsd-uucp: . files

Dirk Meyer dinoex at FreeBSD.org
Tue Feb 7 06:31:39 UTC 2017 

Author: dinoex
Date: Tue Feb  7 06:31:38 2017
New Revision: 433532
URL: https://svnweb.freebsd.org/changeset/ports/433532

Log:
  - update to 1.07.4
  - remove CONFLICTS
  - add LICENSE
  - make portlint happier

Deleted:
  head/net/freebsd-uucp/files/patch-Makefile
  head/net/freebsd-uucp/files/patch-uucp-sample-Makefile
  head/net/freebsd-uucp/files/patch-uucpd.c
  head/net/freebsd-uucp/files/patch-uuto.in
Modified:
  head/net/freebsd-uucp/Makefile
  head/net/freebsd-uucp/distinfo
  head/net/freebsd-uucp/pkg-plist

Modified: head/net/freebsd-uucp/Makefile
==============================================================================
--- head/net/freebsd-uucp/Makefile	Tue Feb  7 05:06:27 2017	(r433531)
+++ head/net/freebsd-uucp/Makefile	Tue Feb  7 06:31:38 2017	(r433532)
@@ -3,14 +3,16 @@
 
 PORTNAME=	freebsd-uucp
 DISTVERSIONPREFIX=	r
-DISTVERSION=	1_07_3
-PORTREVISION=	3
+DISTVERSION=	1_07_4
 CATEGORIES=	net comms ipv6
 PKGNAMESUFFIX?=	${PAM_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	FreeBSD-modified Taylor UUCP (unix-to-unix copy program)
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/uucp/COPYING
+
 USES=		fakeroot
 
 USE_GITHUB=	yes
@@ -41,27 +43,14 @@ MAKE_ENV+=	WITH_PAM=${WITH_PAM}
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 110000
 MAKE_ENV+=	MINUSLPAM=-lpam
 .endif
-CONFLICTS?=	freebsd-uucp-1.*
-.else
-CONFLICTS?=	freebsd-uucp-pam-1.*
 .endif
 
 .if ${PORT_OPTIONS:MENCRYPTED_PASSWORDS}
 MAKE_ENV+=	WITH_ENCRYPTED_PASSWORDS=1
 .endif
 
-post-extract:
-	${REINPLACE_CMD} -e 's|doc ||' ${WRKSRC}/uucp/Makefile
-	${REINPLACE_CMD} -e 's|VERSION=.*|VERSION=${PORTVERSION}|' \
-		${WRKSRC}/uucp/common_sources/configure \
-		${WRKSRC}/uucp/Makefile.inc
-	${REINPLACE_CMD} -e 's|(owner)|(uucpowner)|' \
-		${WRKSRC}/uucp/uustat/Makefile
-	${REINPLACE_CMD} -e 's|0770|0750|' ${WRKSRC}/local.mtree
-	${REINPLACE_CMD} -e 's|getline (|get_line (|g' \
-		${WRKSRC}/uucp/libuucp/getlin.c
-
 do-configure:
+	${REINPLACE_CMD} -e 's|doc ||' ${WRKSRC}/uucp/Makefile
 	${REINPLACE_CMD} -e "s=/usr/local/=${PREFIX}/=" \
 		${FIXME:S,^,${WRKSRC}/,}
 .if ${PORT_OPTIONS:MVAR_LOG}
@@ -70,14 +59,6 @@ do-configure:
 		-e "s=/var/spool/uucp/Debug=/var/log/uucp/Debug=" \
 		-e "s=/var/spool/uucp/Stats=/var/log/uucp/Stats=" \
 		${VARLOG:S,^,${WRKSRC}/,}
-	@${ECHO_CMD} "   .." >> ${WRKSRC}/uucp.mtree
-	@${ECHO_CMD} "/set uname=root gname=wheel mode=0755" \
-		>> ${WRKSRC}/uucp.mtree
-	@${ECHO_CMD} "   log" >> ${WRKSRC}/uucp.mtree
-	@${ECHO_CMD} "/set uname=uucp gname=uucp mode=0775" \
-		>> ${WRKSRC}/uucp.mtree
-	@${ECHO_CMD} "       uucp" >> ${WRKSRC}/uucp.mtree
-	@${ECHO_CMD} "       .." >> ${WRKSRC}/uucp.mtree
 .endif
 .if ${PORT_OPTIONS:MENCRYPTED_PASSWORDS}
 	${REINPLACE_CMD} \
@@ -94,12 +75,14 @@ do-configure:
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure)
 
 pre-install:
-	${MKDIR} ${STAGEDIR}/var
+	${MKDIR} ${STAGEDIR}/var ${STAGEDIR}${PREFIX}/etc/mtree
+	${INSTALL_DATA} ${WRKSRC}/etc/mtree/uucp-var.mtree \
+		${STAGEDIR}${PREFIX}/etc/mtree/uucp-var.mtree
+	${INSTALL_DATA} ${WRKSRC}/etc/mtree/uucp-local.mtree \
+		${STAGEDIR}${PREFIX}/etc/mtree/uucp-local.mtree
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${STAGEDIR}${PREFIX}/info
-	${INSTALL_DATA} ${WRKSRC}/uucp.mtree ${STAGEDIR}${PREFIX}/etc/mtree/uucp-var.mtree
-	${INSTALL_DATA} ${WRKSRC}/local.mtree ${STAGEDIR}${PREFIX}/etc/mtree/uucp-local.mtree
+	${MKDIR} ${STAGEDIR}${PREFIX}/info
 	${INSTALL_DATA} ${WRKSRC}/uucp/doc/uucp.info ${STAGEDIR}${PREFIX}/info/
 
 .include <bsd.port.mk>

Modified: head/net/freebsd-uucp/distinfo
==============================================================================
--- head/net/freebsd-uucp/distinfo	Tue Feb  7 05:06:27 2017	(r433531)
+++ head/net/freebsd-uucp/distinfo	Tue Feb  7 06:31:38 2017	(r433532)
@@ -1,2 +1,3 @@
-SHA256 (dinoex-freebsd-uucp-r1_07_3_GH0.tar.gz) = 0fba2c87f23e9ba337c907e615500f926b8b54d4d445de954470b5f521d4542a
-SIZE (dinoex-freebsd-uucp-r1_07_3_GH0.tar.gz) = 949411
+TIMESTAMP = 1486446112
+SHA256 (dinoex-freebsd-uucp-r1_07_4_GH0.tar.gz) = a9159977215487f869074c4a7377710e3b4f0aff5fe9b27410cbc9980ff3c9e3
+SIZE (dinoex-freebsd-uucp-r1_07_4_GH0.tar.gz) = 949854

Modified: head/net/freebsd-uucp/pkg-plist
==============================================================================
--- head/net/freebsd-uucp/pkg-plist	Tue Feb  7 05:06:27 2017	(r433531)
+++ head/net/freebsd-uucp/pkg-plist	Tue Feb  7 06:31:38 2017	(r433532)
@@ -43,16 +43,17 @@ bin/cu
 bin/uustat
 libexec/uucp/uucico
 @owner
- at exec pw usermod uucp -s %D/libexec/uucp/uucico
- at exec mtree -deU -f %D/etc/mtree/uucp-var.mtree -p /var
- at exec mtree -deU -f %D/etc/mtree/uucp-local.mtree -p %D
- at unexec rm -d /var/spool/uucppublic 2>/dev/null || true
- at unexec rm -d /var/spool/uucp/.Preserve 2>/dev/null || true
- at unexec rm -d /var/spool/uucp/.Sequence 2>/dev/null || true
- at unexec rm -d /var/spool/uucp/.Status 2>/dev/null || true
- at unexec rm -d /var/spool/uucp/.Temp 2>/dev/null || true
- at unexec rm -d /var/spool/uucp/.Xqtdir 2>/dev/null || true
- at unexec rm -d /var/spool/uucp 2>/dev/null || true
-%%VAR_LOG%%@unexec rm -d /var/log/uucp 2>/dev/null || true
- at exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ; echo "suucp               4031/tcp  #UUCP over SSL";  echo "suucp               4031/udp  #UUCP over SSL") > /etc/services
- at unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ) > /etc/services
+ at group
+ at preexec pw usermod uucp -s %D/libexec/uucp/uucico
+ at preexec mtree -deU -f %D/etc/mtree/uucp-var.mtree -p /var
+ at preexec mtree -deU -f %D/etc/mtree/uucp-local.mtree -p %D
+ at preexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ; echo "suucp               4031/tcp  #UUCP over SSL";  echo "suucp               4031/udp  #UUCP over SSL") > /etc/services
+ at postunexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ) > /etc/services
+%%VAR_LOG%%@dir(uucp,uucp,775) /var/log/uucp
+ at dir(uucp,uucp,775) /var/spool/uucp/.Preserve
+ at dir(uucp,uucp,775) /var/spool/uucp/.Sequence
+ at dir(uucp,uucp,775) /var/spool/uucp/.Status
+ at dir(uucp,uucp,775) /var/spool/uucp/.Temp
+ at dir(uucp,uucp,775) /var/spool/uucp/.Xqtdir
+ at dir(uucp,uucp,775) /var/spool/uucp
+ at dir(uucp,uucp,777) /var/spool/uucppublic

More information about the svn-ports-all mailing list