Attachment 131512 Details for Bug 175591 – file.diff

[patch] file.diff

file.diff (text/plain), 4.44 KB, created by tkato432 on 2013-01-25 21:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-01-25 21:10:07 UTC

Size: 4.44 KB

patch

obsolete

>diff -urN /usr/ports/archivers/star/Makefile archivers/star/Makefile
>--- /usr/ports/archivers/star/Makefile	2013-01-01 03:52:00.000000000 +0900
>+++ archivers/star/Makefile	2013-01-26 01:54:26.000000000 +0900
>@@ -2,30 +2,28 @@
> # $FreeBSD: head/archivers/star/Makefile 309742 2012-12-31 14:07:52Z bapt $
> 
> PORTNAME=	star
>-DISTVERSION=	1.5.1
>-PORTREVISION=	1
>+DISTVERSION=	1.5.2
> CATEGORIES=	archivers
> MASTER_SITES=	ftp://ftp.berlios.de/pub/star/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Unique standard tape archiver with many enhancements
> 
>+LICENSE=	CDDL GPLv2
>+LICENSE_COMB=	multi
>+
> BUILD_DEPENDS=	${LOCALBASE}/bin/smake:${PORTSDIR}/devel/smake
> 
> USE_BZIP2=	yes
> USE_GETTEXT=	yes
>-USE_ICONV=	yes
> 
>-.if !defined(NO_INSTALL_MANPAGES)
>+SMAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
>+		CXXFLAGS="${CXXFLAGS}"
>+SMAKE_ARGS=	INS_BASE=${PREFIX} DEFMANBASE=.
>+
>+MLINKS=		star.1 ustar.1 star.5 ustar.5
> MAN1=		star.1 srmt.1 tartest.1
> MAN5=		star.5
>-MLINKS=		star.1 ustar.1 star.5 ustar.5
>-.else
>-XMKFLAGS=	XMK_FILE=""
>-.endif
>-
>-MAKE_ENV+=	MAKEFLAGS=${MAKEFLAGS}
>-
> PORTDOCS=	README README.crash README.mtio README.pattern STARvsGNUTAR \
> 		README.ACL README.largefiles README.otherbugs \
> 		README.posix-2001
>@@ -38,33 +36,32 @@
> 	@${MV} ${WRKSRC}/rmt/rmt.1 ${WRKSRC}/rmt/srmt.1
> 
> do-build:
>-	@cd ${WRKSRC} && ${MAKE_ENV} ${LOCALBASE}/bin/smake
>-	@cd ${WRKSRC}/star && ${MAKE_ENV} ${LOCALBASE}/bin/smake -f Makefile.doc
>+	@cd ${WRKSRC} && ${SMAKE_ENV} ${LOCALBASE}/bin/smake ${SMAKE_ARGS}
>+	@cd ${WRKSRC}/star && ${SMAKE_ENV} ${LOCALBASE}/bin/smake \
>+		-f Makefile.doc ${SMAKE_ARGS}
> 
> do-install:
>-	@cd ${WRKSRC}/star && ${MAKE_ENV} ${LOCALBASE}/bin/smake \
>-		${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS}
>-	@cd ${WRKSRC}/rmt && ${MAKE_ENV} ${LOCALBASE}/bin/smake \
>-		${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS}
>-	@cd ${WRKSRC}/tartest && ${MAKE_ENV} ${LOCALBASE}/bin/smake \
>-		${INSTALL_TARGET} INS_BASE=${PREFIX} ${XMKFLAGS}
>-	@${STRIP_CMD} ${PREFIX}/bin/star
>-	@${STRIP_CMD} ${PREFIX}/sbin/srmt
>-	@${STRIP_CMD} ${PREFIX}/bin/tartest
>-	@${INSTALL_DATA} ${WRKSRC}/star/star.dfl ${PREFIX}/etc/star.sample
>-	@if [ ! -f ${PREFIX}/etc/star ]; then \
>-		${CP} -p ${PREFIX}/etc/star.sample ${PREFIX}/etc/star; \
>-	fi
>-	@${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl ${PREFIX}/etc/rmt.sample
>-	@if [ ! -f ${PREFIX}/etc/rmt ]; then \
>-		${CP} -p ${PREFIX}/etc/rmt.sample ${PREFIX}/etc/rmt; \
>-	fi
>-
>-post-install:
>+	@cd ${WRKSRC}/star && ${SMAKE_ENV} ${LOCALBASE}/bin/smake \
>+		${SMAKE_ARGS} ${INSTALL_TARGET}
>+	@cd ${WRKSRC}/rmt && ${SMAKE_ENV} ${LOCALBASE}/bin/smake \
>+		${SMAKE_ARGS} ${INSTALL_TARGET}
>+	@cd ${WRKSRC}/tartest && ${SMAKE_ENV} ${LOCALBASE}/bin/smake \
>+		${SMAKE_ARGS} ${INSTALL_TARGET}
>+.for i in bin/star bin/tartest sbin/srmt
>+	@${STRIP_CMD} ${PREFIX}/${i}
>+.endfor
>+	${INSTALL_DATA} ${WRKSRC}/star/star.dfl ${PREFIX}/etc/star.sample
>+.if !exists(${PREFIX}/etc/star)
>+	@${CP} -p ${PREFIX}/etc/star.sample ${PREFIX}/etc/star
>+.endif
>+	${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl ${PREFIX}/etc/rmt.sample
>+.if !exists(${PREFIX}/etc/rmt)
>+	@${CP} -p ${PREFIX}/etc/rmt.sample ${PREFIX}/etc/rmt
>+.endif
> .if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${DOCSDIR}
>-.for FILE in ${PORTDOCS}
>-	@${INSTALL_DATA} ${WRKSRC}/star/${FILE} ${DOCSDIR}/${FILE}
>+.for i in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/star/${i} ${DOCSDIR}
> .endfor
> .endif
> 
>diff -urN /usr/ports/archivers/star/distinfo archivers/star/distinfo
>--- /usr/ports/archivers/star/distinfo	2012-11-08 04:19:06.000000000 +0900
>+++ archivers/star/distinfo	2013-01-13 04:26:25.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (star-1.5.1.tar.bz2) = 918cf5d7f2285104990d608dd3e8873a10c60fa56fd21c9b527d6829dea3828e
>-SIZE (star-1.5.1.tar.bz2) = 824489
>+SHA256 (star-1.5.2.tar.bz2) = 762645b98af13bb9b0512812814ec8e90635d1400c94eb5911e9774daed2addf
>+SIZE (star-1.5.2.tar.bz2) = 874558
>diff -urN /usr/ports/archivers/star/files/patch-star::Makefile archivers/star/files/patch-star::Makefile
>--- /usr/ports/archivers/star/files/patch-star::Makefile	2012-11-08 04:19:06.000000000 +0900
>+++ archivers/star/files/patch-star::Makefile	2013-01-13 06:04:25.000000000 +0900
>@@ -13,9 +13,9 @@
>  #
>  #	Wenn -lfind, dann auch  $(LIB_INTL)
>  #
>--XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
>+-XMK_FILE=	Makefile.man ustarman.mk starformatman.mk scpioman.mk gnutarman.mk \
> -		spaxman.mk suntarman.mk Makefile.dfl Makefile.doc
>-+XMK_FILE=	Makefile.man starformatman.mk
>++XMK_FILE=	Makefile.man ustarman.mk starformatman.mk
>  
>  star_fat.c: star.c
>  	$(RM) $(RM_FORCE) $@; cp star.c $@

Actions: View | Diff

Attachments on bug 175591: 131512