svn commit: r385280 - head/news/ifmail

[Baptiste Daroussin]

Author: bapt
Date: Sun May  3 15:12:08 2015
New Revision: 385280
URL: https://svnweb.freebsd.org/changeset/ports/385280

Log:
  Overwrite variables via MAKE_ARGS instead of patching a file
  Set OWNER/GROUP to the current building user so that we can stage as a user
  plist make sure the owner of the final files when installed are the right one
  Do not create a user from port plist makes it already
  Do not modify /etc/services from ports plist does is already
  Remove now uneeded NEED_ROOT

Modified:
  head/news/ifmail/Makefile

Modified: head/news/ifmail/Makefile
==============================================================================
--- head/news/ifmail/Makefile	Sun May  3 15:12:06 2015	(r385279)
+++ head/news/ifmail/Makefile	Sun May  3 15:12:08 2015	(r385280)
@@ -10,28 +10,21 @@ MASTER_SITE_SUBDIR=	system/fido
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	FidoNet(tm) support package for UN*X platform
 
-NEED_ROOT=	yes
-
 MAN3=		parsedate.3
 MAN8=		ifmail.8 iftoss.8
 IFMAIL_RUNAS?=	ifmail
 PLIST_SUB+=	IFMAIL_RUNAS="${IFMAIL_RUNAS}"
 # USERS does not work here
 #USERS=		ifmail
+CFLAGS+=	-DHAS_STDARG_H -Wall
+GID!=		id -g
+MAKE_ARGS=	OWNER=${UID} CC="${CC}" GROUP=${GID} CFLAGS="${CFLAGS}"
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|OWNER = ifmail|OWNER = ${IFMAIL_RUNAS}|' \
-		-e 's|CC = gcc|CC = ${CC}|' \
-		-e 's|-O2 -Wall|${CFLAGS} -DHAS_STDARG_H -Wall|' \
-		${WRKSRC}/CONFIG
-
 pre-install:
-	if ! pw usershow ${IFMAIL_RUNAS}; then pw useradd ${IFMAIL_RUNAS} -g uucp -u 75 \
-		-h - -d /nonexistent -s /nonexistent -c "Ifmail Server"; fi
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ifmail
 
 post-install:
@@ -41,11 +34,6 @@ post-install:
 .for i in ${MAN3}
 	${INSTALL_MAN} ${WRKSRC}/iflib/${i} ${STAGEDIR}${PREFIX}/man/man3/
 .endfor
-	@${ECHO_CMD} "updating ${ROOTDIR}/etc/services"
-	@${CP} ${ROOTDIR}/etc/services ${ROOTDIR}/etc/services.bak
-	@(grep -v ^ifcico ${ROOTDIR}/etc/services.bak; \
-	${ECHO_CMD} "ifcico		60179/tcp  #ifcico server (ifmail)") \
-		> ${ROOTDIR}/etc/services
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/