Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Nov 2013 15:08:34 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334206 - in head/games/inform: . files
Message-ID:  <201311181508.rAIF8YZS043663@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Mon Nov 18 15:08:34 2013
New Revision: 334206
URL: http://svnweb.freebsd.org/changeset/ports/334206

Log:
  - Add stage support
  - Put Makefile variables in order

Modified:
  head/games/inform/Makefile
  head/games/inform/files/Makefile.inform

Modified: head/games/inform/Makefile
==============================================================================
--- head/games/inform/Makefile	Mon Nov 18 15:06:43 2013	(r334205)
+++ head/games/inform/Makefile	Mon Nov 18 15:08:34 2013	(r334206)
@@ -5,13 +5,11 @@ PORTNAME=	inform
 PORTVERSION=	6.32
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/source/ \
-		ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/library/:lib
+		ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/library/:lib \
+		ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/:doc
+DISTFILES=	inform${PORTVERSION:S/.//}_source.zip inform_library611.zip:lib \
+		designers_manual_4.zip:doc
 DIST_SUBDIR=	inform
-DISTFILES=	inform${PORTVERSION:S/.//}_source.zip inform_library611.zip:lib
-.if !defined(NOPORTDOCS)
-MASTER_SITES+=	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/:doc
-DISTFILES+=	designers_manual_4.zip:doc
-.endif
 EXTRACT_ONLY=	inform${PORTVERSION:S/.//}_source.zip
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,27 +22,17 @@ NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 MAKEFILE=	${FILESDIR}/Makefile.inform
 
-# Install the library files in ${PREFIX}/share/inform, and install
-# documentation if appropriate.
-
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${DATADIR}
-	(cd ${DATADIR} && \
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${STAGEDIR}${DATADIR} && \
 		${UNZIP_CMD} -qq -o ${DISTDIR}/${DIST_SUBDIR}/inform_library611.zip)
 .for file in English.h Grammar.h Parser.h VerbLib.h infix.h linklpa.h \
 		linklv.h parserm.h verblibm.h
-	${CHMOD} ${SHAREMODE} ${DATADIR}/${file}
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/${file}
+	${CHMOD} ${SHAREMODE} ${STAGEDIR}${DATADIR}/${file}
 .endfor
-.if defined(NOPORTDOCS)
-	@${RM} ${DATADIR}/readme.txt
-.else
-	@${MKDIR} ${DOCSDIR}
-	(umask 222 && ${UNZIP_CMD} -qq -o -d ${DOCSDIR} \
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(umask 222 && ${UNZIP_CMD} -qq -o -d ${STAGEDIR}${DOCSDIR} \
 		${DISTDIR}/${DIST_SUBDIR}/designers_manual_4.zip)
-	@${MV} ${DATADIR}/readme.txt ${DOCSDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-.endif
+	@${MV} ${STAGEDIR}${DATADIR}/readme.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/inform/files/Makefile.inform
==============================================================================
--- head/games/inform/files/Makefile.inform	Mon Nov 18 15:06:43 2013	(r334205)
+++ head/games/inform/files/Makefile.inform	Mon Nov 18 15:08:34 2013	(r334206)
@@ -12,4 +12,4 @@ inform:		$(OBJS)
 		$(CC) $(CFLAGS) -o ${.TARGET} $(OBJS)
 
 install:	inform
-		${BSD_INSTALL_PROGRAM} inform ${PREFIX}/bin
+		${BSD_INSTALL_PROGRAM} inform ${DESTDIR}${PREFIX}/bin



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