Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Dec 2013 12:53:25 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337142 - in head/news/ifmail: . files
Message-ID:  <201312211253.rBLCrPuw032931@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Sat Dec 21 12:53:25 2013
New Revision: 337142
URL: http://svnweb.freebsd.org/changeset/ports/337142

Log:
  - use STAGEDIR

Modified:
  head/news/ifmail/Makefile
  head/news/ifmail/files/patch-CONFIG
  head/news/ifmail/pkg-plist

Modified: head/news/ifmail/Makefile
==============================================================================
--- head/news/ifmail/Makefile	Sat Dec 21 12:53:21 2013	(r337141)
+++ head/news/ifmail/Makefile	Sat Dec 21 12:53:25 2013	(r337142)
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	system/fido
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	FidoNet(tm) support package for UN*X platform
 
-NO_STAGE=	yes
+NEED_ROOT=	yes
 
 MAN3=		parsedate.3
 MAN8=		ifmail.8 iftoss.8
@@ -19,40 +19,41 @@ PLIST_SUB+=	IFMAIL_RUNAS="${IFMAIL_RUNAS
 # USERS does not work here
 #USERS=		ifmail
 
+.include <bsd.port.options.mk>
+
 pre-configure:
-	@${MV} ${WRKSRC}/CONFIG ${WRKSRC}/CONFIG.sed
-	${SED} -e "s/OWNER = ifmail/OWNER = ${IFMAIL_RUNAS}/" \
-		-e "s#CC = gcc#CC = ${CC}#" \
-		-e "s#-O2 -Wall#${CFLAGS} -DHAS_STDARG_H -Wall#" \
-		${WRKSRC}/CONFIG.sed > ${WRKSRC}/CONFIG
+	${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} ${PREFIX}/libexec/ifmail
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ifmail
 
 post-install:
 .for i in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/ifgate/${i} ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/ifgate/${i} ${STAGEDIR}${PREFIX}/man/man8/
 .endfor
 .for i in ${MAN3}
-	${INSTALL_MAN} ${WRKSRC}/iflib/${i} ${PREFIX}/man/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 !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 .for i in ifcico ifgate iflib
-	${INSTALL_DATA} ${WRKSRC}/${i}/README ${DOCSDIR}/README.${i}
+	${INSTALL_DATA} ${WRKSRC}/${i}/README ${STAGEDIR}${DOCSDIR}/README.${i}
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	@${TAR} -C ${WRKSRC}/misc -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf -
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${TAR} -C ${WRKSRC}/misc -cf - . | ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf -
 .endif
 
 .include <bsd.port.mk>

Modified: head/news/ifmail/files/patch-CONFIG
==============================================================================
--- head/news/ifmail/files/patch-CONFIG	Sat Dec 21 12:53:21 2013	(r337141)
+++ head/news/ifmail/files/patch-CONFIG	Sat Dec 21 12:53:25 2013	(r337142)
@@ -73,7 +73,7 @@
  
  # for make install, where to put binaries and what owner to set
 -BINDIR = /usr/lib/ifmail
-+BINDIR = ${PREFIX}/libexec/ifmail
++BINDIR = ${DESTDIR}${PREFIX}/libexec/ifmail
  OWNER = ifmail
  GROUP = uucp
  MODE = 0711

Modified: head/news/ifmail/pkg-plist
==============================================================================
--- head/news/ifmail/pkg-plist	Sat Dec 21 12:53:21 2013	(r337141)
+++ head/news/ifmail/pkg-plist	Sat Dec 21 12:53:25 2013	(r337142)
@@ -1,3 +1,6 @@
+man/man3/parsedate.3.gz
+man/man8/ifmail.8.gz
+man/man8/iftoss.8.gz
 @exec if ! pw usershow %%IFMAIL_RUNAS%% 2>/dev/null; then pw useradd %%IFMAIL_RUNAS%% -g uucp -u 75 -h - -d /nonexistent -s /nonexistent -c "Ifmail Server"; fi
 @unexec if pw usershow %%IFMAIL_RUNAS%% | grep -q 75:66; then pw userdel %%IFMAIL_RUNAS%%; fi
 @owner ifmail



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312211253.rBLCrPuw032931>