diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2004-08-29 14:05:11 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2004-08-29 14:05:11 +0000 |
| commit | e9fd92b0435e8abf67cc17ccc12c1a70d3dc0841 (patch) | |
| tree | d045cd8613340e6ba8c228880508421b5db21aed | |
| parent | 50ebe8ef3d2c7439ffc529bfbc018f479b621e34 (diff) | |
| download | ports-e9fd92b0435e8abf67cc17ccc12c1a70d3dc0841.tar.gz ports-e9fd92b0435e8abf67cc17ccc12c1a70d3dc0841.zip | |
Notes
| -rw-r--r-- | archivers/bsdtar/Makefile | 23 | ||||
| -rw-r--r-- | archivers/bsdtar/distinfo | 4 | ||||
| -rw-r--r-- | archivers/bsdtar/files/diff-bsdtar.h | 10 | ||||
| -rw-r--r-- | archivers/bsdtar/files/patch-Makefile | 17 |
4 files changed, 8 insertions, 46 deletions
diff --git a/archivers/bsdtar/Makefile b/archivers/bsdtar/Makefile index 9a8ef42dec66..9e98f93890c7 100644 --- a/archivers/bsdtar/Makefile +++ b/archivers/bsdtar/Makefile @@ -5,29 +5,25 @@ # $FreeBSD$ PORTNAME= bsdtar -PORTVERSION= 2004.07.14 +PORTVERSION= 1.01.011 +PORTEPOCH= 1 CATEGORIES= archivers MASTER_SITES= http://people.freebsd.org/~kientzle/libarchive/src/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g} -EXTRACT_SUFX= .tgz MAINTAINER= martin@tradex.sk COMMENT= New tar archiver from FreeBSD-CURRENT BUILD_DEPENDS= ${LOCALBASE}/lib/libarchive.a:${PORTSDIR}/archivers/libarchive -WRKSRC= ${WRKDIR}/${PORTNAME} - CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -MAKE_FLAGS+= BINDIR=${PREFIX}/bin \ - MANDIR=${PREFIX}/man/man +GNU_CONFIGURE= yes +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/bsdtar -USE_REINPLACE= yes - -MANCOMPRESSED= yes +MANCOMPRESSED= no MAN1= bsdtar.1 .include <bsd.port.pre.mk> @@ -36,11 +32,4 @@ MAN1= bsdtar.1 IGNORE= is in the base system .endif -.if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${PATCHDIR}/diff-bsdtar.h -.endif - -post-patch: - @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/Makefile - .include <bsd.port.post.mk> diff --git a/archivers/bsdtar/distinfo b/archivers/bsdtar/distinfo index b050c632f80e..a386bbb09af9 100644 --- a/archivers/bsdtar/distinfo +++ b/archivers/bsdtar/distinfo @@ -1,2 +1,2 @@ -MD5 (bsdtar-2004-07-14.tgz) = 3be99578825c9a3ba606ad12783785b4 -SIZE (bsdtar-2004-07-14.tgz) = 41039 +MD5 (bsdtar-1.01.011.tar.gz) = e3def76fd560fd87a8a52c66d5d7dcbb +SIZE (bsdtar-1.01.011.tar.gz) = 100316 diff --git a/archivers/bsdtar/files/diff-bsdtar.h b/archivers/bsdtar/files/diff-bsdtar.h deleted file mode 100644 index 832d538f0cc8..000000000000 --- a/archivers/bsdtar/files/diff-bsdtar.h +++ /dev/null @@ -1,10 +0,0 @@ ---- bsdtar.h.orig Sun Jul 18 11:08:41 2004 -+++ bsdtar.h Sun Jul 18 11:09:20 2004 -@@ -107,3 +107,7 @@ - void usage(struct bsdtar *); - int yes(const char *fmt, ...); - -+#ifndef id_t -+typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */ -+typedef __id_t id_t; /* can hold a uid_t or pid_t */ -+#endif diff --git a/archivers/bsdtar/files/patch-Makefile b/archivers/bsdtar/files/patch-Makefile deleted file mode 100644 index 9d32a5a70b9a..000000000000 --- a/archivers/bsdtar/files/patch-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.orig Thu Jun 3 23:46:09 2004 -+++ Makefile Sun Jul 18 10:58:12 2004 -@@ -4,12 +4,8 @@ - SRCS= bsdtar.c matching.c read.c util.c write.c - WARNS?= 6 - DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} --LDADD= -larchive -lbz2 -lz -- --.if defined(WITH_BSDTAR) --SYMLINKS= ${BINDIR}/bsdtar ${BINDIR}/tar --MLINKS= bsdtar.1 tar.1 --.endif -+LDADD= -L%%LOCALBASE%%/lib/ %%LOCALBASE%%/lib/libarchive.a -lbz2 -lz -+CFLAGS+=-I%%LOCALBASE%%/include - - .include <bsd.prog.mk> - |