Date: Thu, 8 May 2014 19:20:45 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353347 - in head/japanese/cdrom2: . files Message-ID: <201405081920.s48JKjfd086602@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Thu May 8 19:20:44 2014 New Revision: 353347 URL: http://svnweb.freebsd.org/changeset/ports/353347 QAT: https://qat.redports.org/buildarchive/r353347/ Log: - Add staging support, allow it as normal user - Respect CFLAGS during build - Remove leading article from COMMENT - Switch to PLIST_FILES - Define DOCS option Deleted: head/japanese/cdrom2/pkg-plist Modified: head/japanese/cdrom2/Makefile head/japanese/cdrom2/files/Makefile Modified: head/japanese/cdrom2/Makefile ============================================================================== --- head/japanese/cdrom2/Makefile Thu May 8 18:40:32 2014 (r353346) +++ head/japanese/cdrom2/Makefile Thu May 8 19:20:44 2014 (r353347) @@ -9,28 +9,28 @@ MASTER_SITES= http://www.nerimadors.or.j DISTNAME= euc MAINTAINER= ports@FreeBSD.org -COMMENT= A tool to lookup CD-ROM dictionaries +COMMENT= Tool to lookup CD-ROM dictionaries WRKSRC= ${WRKDIR}/${PORTNAME} DIST_SUBDIR= ${PORTNAME} -DOCS= errata.doc gaiji.txt index.doc install.doc kekka.txt \ + +PLIST_FILES= bin/cdgaiji bin/cdrom2 lib/cdrom2/kojien3.tbl \ + lib/cdrom2/ruigo.tbl +PLIST_DIRS= lib/cdrom2 +PORTDOCS= errata.doc gaiji.txt index.doc install.doc kekka.txt \ kojien3.doc menu.doc readers.doc readme.doc readme.org \ ruigo.doc x_option.doc SUB_FILES+= pkg-message -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + do-configure: @${ECHO_MSG} "Copying custom Makefile." @${CP} ${FILESDIR}/Makefile ${WRKSRC} -.if !defined(NOPORTDOCS) post-install: - @${MKDIR} ${DOCSDIR} -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR} -.endfor - @${CAT} ${PKGMESSAGE} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/japanese/cdrom2/files/Makefile ============================================================================== --- head/japanese/cdrom2/files/Makefile Thu May 8 18:40:32 2014 (r353346) +++ head/japanese/cdrom2/files/Makefile Thu May 8 19:20:44 2014 (r353347) @@ -11,18 +11,18 @@ TBL_FILES=kojien3.tbl ruigo.tbl all: ${PROGRAMS} cdrom2: cdrom2.c - cc -DUNIX -O -o cdrom2 cdrom2.c + cc -DUNIX ${CFLAGS} -o cdrom2 cdrom2.c cdgaiji: cdgaiji.c - cc -DUNIX -O -o cdgaiji cdgaiji.c + cc -DUNIX ${CFLAGS} -o cdgaiji cdgaiji.c install: for f in ${PROGRAMS} ; do \ - /usr/bin/install -c -s -o bin -g bin -m 755 $$f ${BINDIR} ;\ + ${BSD_INSTALL_PROGRAM} $$f ${DESTDIR}${BINDIR} ;\ done - /bin/mkdir -p ${LIBDIR} + /bin/mkdir -p ${DESTDIR}${LIBDIR} for f in ${TBL_FILES} ; do \ - /usr/bin/install -c -o bin -g bin -m 644 $$f ${LIBDIR} ;\ + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR} ;\ done clean:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405081920.s48JKjfd086602>