Date: Fri, 8 Nov 2013 12:07:51 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333203 - in head/sysutils/afio: . files Message-ID: <201311081207.rA8C7pFc065959@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Nov 8 12:07:50 2013 New Revision: 333203 URL: http://svnweb.freebsd.org/changeset/ports/333203 Log: Support STAGEDIR. Added: head/sysutils/afio/files/patch-Makefile (contents, props changed) Deleted: head/sysutils/afio/files/patch-aa Modified: head/sysutils/afio/Makefile head/sysutils/afio/pkg-plist Modified: head/sysutils/afio/Makefile ============================================================================== --- head/sysutils/afio/Makefile Fri Nov 8 12:03:37 2013 (r333202) +++ head/sysutils/afio/Makefile Fri Nov 8 12:07:50 2013 (r333203) @@ -12,11 +12,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Archiver & backup program w/ builtin compression ALL_TARGET= ${PORTNAME} -MAN1= afio.1 OPTIONS_DEFINE= DOCS EXAMPLES -PORTDOCS= README SCRIPTS -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|^CC=.*$$|CC=${CC}|' \ ${WRKSRC}/Makefile @@ -25,19 +22,16 @@ post-patch: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${WRKSRC}/SCRIPTS ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/README ${WRKSRC}/SCRIPTS ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${FILESDIR}/afiodump.example ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/script1/DONTDUMP ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/script2/* ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/script3/* ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/script4/* ${EXAMPLESDIR} -PLIST_SUB+= PORTEXAMPLES="" -.else -PLIST_SUB+= PORTEXAMPLES="@comment " + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${FILESDIR}/afiodump.example ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/script1/DONTDUMP ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/script2/* ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/script3/* ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/script4/* ${STAGEDIR}${EXAMPLESDIR} .endif .include <bsd.port.mk> Added: head/sysutils/afio/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/afio/files/patch-Makefile Fri Nov 8 12:07:50 2013 (r333203) @@ -0,0 +1,62 @@ +--- Makefile.orig 2003-12-21 18:23:51.000000000 +0800 ++++ Makefile 2013-11-08 09:56:31.000000000 +0800 +@@ -28,7 +28,7 @@ SHELL=/bin/sh + c = -DHAVEMEMCMP + ## Define DEFFMTCMD to being how to format the media you use the most + ## This is the DEFault FoRMat CoManD. +-d = -DDEFFMTCMD='"fdformat /dev/fd0H1440"' ++d = -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0"' + ## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char + ## file name (or longer for BSD) in the archive when the file is compressed + #e = -DLONGZFILE +@@ -39,7 +39,7 @@ e2 = -DHAVE_LCHOWN + + ## Define PRG_COMPRESS to get something other than `gzip'. + # you need to edit compfile.c (-G option) if you change this line. +-f = -DPRG_COMPRESS='"gzip"' ++f = -DPRG_COMPRESS='"/usr/bin/gzip"' + + ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for + # -y -Y -w -W matching. +@@ -49,6 +49,11 @@ f = -DPRG_COMPRESS='"gzip"' + + g = -DHAVEFNMATCH + ++## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD ++# detection. ++ ++h = -DHAVE_PARAM_H ++ + # fnmatch() is in the gnu C library, so it is directly available on + # Linux. If your system (e.g. SCO) does not have the gnu C library, + # unpack the archive gnu.fnmatch.tar.gz and uncomment the following +@@ -71,11 +76,14 @@ LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D + MW= + #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations + +-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} ++#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} ++CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce + +-CC=gcc ++#CC=gcc ++#CC=cc + +-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I ++#CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I ++CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I + LDFLAGS = + + afio : afio.o compfile.o exten.o match.o $M +@@ -88,8 +96,9 @@ clean: + cd regtest; /bin/sh regtest.clean + + install: afio +- cp afio /usr/local/bin +- cp afio.1 /usr/share/man/man1 ++ install -cs -o root -g wheel afio ${DESTDIR}${PREFIX}/bin ++ install -c -o root -g wheel afio.1 ${DESTDIR}${PREFIX}/man/man1 ++ + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk Modified: head/sysutils/afio/pkg-plist ============================================================================== --- head/sysutils/afio/pkg-plist Fri Nov 8 12:03:37 2013 (r333202) +++ head/sysutils/afio/pkg-plist Fri Nov 8 12:07:50 2013 (r333203) @@ -1,4 +1,7 @@ bin/afio +man/man1/afio.1.gz +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/SCRIPTS %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DONTDUMP %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/afiodump.example @@ -12,3 +15,4 @@ bin/afio %%PORTEXAMPLES%%%%EXAMPLESDIR%%/x.dot %%PORTEXAMPLES%%%%EXAMPLESDIR%%/x.home %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311081207.rA8C7pFc065959>