2 files changed, 31 insertions, 68 deletions

diff --git a/net/openospfd/Makefile b/net/openospfd/Makefile
index 07421e7b83d6..194d54aafd90 100644
--- a/net/openospfd/Makefile
+++ b/net/openospfd/Makefile
@@ -4,9 +4,8 @@ PORTNAME=	openospfd
 PORTVERSION=	4.3
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_OPENBSD:S/$/:openbsd/g} \
-		${MASTER_SITE_LOCAL:S/$/:freebsd/g}
-MASTER_SITE_SUBDIR=	flz/openospfd/:freebsd OpenBGPD/:openbsd
+MASTER_SITES=	OPENBSD/OpenBGPD:openbsd \
+		LOCAL/flz/openospfd/:freebsd
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:openbsd \
 		if_media.h:freebsd
 DIST_SUBDIR=	${PORTNAME}
@@ -15,34 +14,33 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Free implementation of the Open Shortest Path First Protocol
 
-LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
+LICENSE=	ISCL
 
 CONFLICTS=	zebra-0* quagga-0*
 
-WRKSRC=		${WRKDIR}
-MANCOMPRESSED=	yes
-USE_RC_SUBR=	openospfd
+LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
 COPTS=		-I${LOCALBASE}/include -DMD5_DIGEST_LENGTH=16
 LDADD=		-L${LOCALBASE}/lib -levent -lmd
+NO_WRKSUBDIR=	yes
+USE_RC_SUBR=	${PORTNAME}
+USERS=		_ospfd
+GROUPS=		_ospfd
 
-PLIST_FILES=	sbin/ospfctl	\
-		sbin/ospfd
-
-MAN5=		ospfd.conf.5
-MAN8=		ospfctl.8	\
-		ospfd.8
+PLIST_FILES=	sbin/ospfctl \
+		sbin/ospfd \
+		man/man5/ospfd.conf.5.gz \
+		man/man8/ospfctl.8.gz \
+		man/man8/ospfd.8.gz
 
-SUBDIRS=	ospfd \
-		ospfctl
-
-NO_STAGE=	yes
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/ospfctl/
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|<net/if_media.h>|\"if_media.h\"|" ${WRKSRC}/ospfctl/ospfctl.c
+	@${REINPLACE_CMD} -e "s|<net/if_media\.h>|\"if_media.h\"|" \
+		${WRKSRC}/ospfctl/ospfctl.c
 	@${REINPLACE_CMD} -e "/rc.conf.local/d" ${WRKSRC}/ospfd/ospfd.conf.5
 	@${REINPLACE_CMD} -e "s|SIMPLEQ|STAILQ|" ${WRKSRC}/ospfd/*.[chy]
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" \
@@ -54,23 +52,24 @@ post-patch:
 		${WRKSRC}/ospfd/ospfd.c \
 		${WRKSRC}/ospfctl/ospfctl.c
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000003
+BROKEN=		requires old CARP implementation (interface layer)
+.endif
+
 do-build:
-.for i in ${SUBDIRS}
-	cd ${WRKSRC}/$i; make COPTS="${COPTS}" LDADD="${LDADD}"
+.for subdir in ospfd ospfctl
+	${MAKE_CMD} -C ${WRKSRC}/${subdir} COPTS="${COPTS}" LDADD="${LDADD}"
 .endfor
 
 do-install:
-.for i in ${SUBDIRS}
-	cd ${WRKSRC}/$i; make install ${MAKE_ENV} LOCALBASE=${LOCALBASE}
-.endfor
-
-post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-BROKEN=		Does not build on FreeBSD 10+
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/ospfctl/ospfctl ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/ospfctl/ospfctl.8 \
+		${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/ospfd/ospfd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/ospfd/ospfd.conf.5 \
+		${STAGEDIR}${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/ospfd/ospfd.8 ${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/openospfd/pkg-install b/net/openospfd/pkg-install
deleted file mode 100644
index dda8b52eb6fd..000000000000
--- a/net/openospfd/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=_ospfd
-	GROUP=${USER}
-	UID=131
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d "/var/empty" -s /sbin/nologin -c "OSPF Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	exit 0
-	;;
-esac