aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-09-29 16:48:31 +0800
committervs <vs@FreeBSD.org>2005-09-29 16:48:31 +0800
commit60d168ea2c0bce844ca79e04eadae891896a9e05 (patch)
tree545b36281ab808491d5363f8c2f558e72ccdd4fb
parent61f7b1f1855e639c017267e7e337dc78ac20cc12 (diff)
downloadfreebsd-ports-gnome-60d168ea2c0bce844ca79e04eadae891896a9e05.tar.gz
freebsd-ports-gnome-60d168ea2c0bce844ca79e04eadae891896a9e05.tar.zst
freebsd-ports-gnome-60d168ea2c0bce844ca79e04eadae891896a9e05.zip
Use bsd.prog.mk directly
-rw-r--r--archivers/untar/Makefile9
-rw-r--r--archivers/untar/files/Makefile.untar11
2 files changed, 5 insertions, 15 deletions
diff --git a/archivers/untar/Makefile b/archivers/untar/Makefile
index 08d30338d3c2..a731e0d53047 100644
--- a/archivers/untar/Makefile
+++ b/archivers/untar/Makefile
@@ -17,17 +17,18 @@ EXTRACT_ONLY=
MAINTAINER= ports@FreeBSD.org
COMMENT= Lists/Extracts files from a "*.tgz" or "*.gz" archive
+MAKEFILE= /usr/share/mk/bsd.prog.mk
NO_WRKSUBDIR= yes
-NO_INSTALL_MANPAGES= yes
PLIST_FILES= bin/untar
-PROG= untar
+MAKE_ENV+= PROG=untar NOMAN=yes
+MAKE_ARGS+= CFLAGS="${CFLAGS} -D_POSIX_SOURCE" \
+ LDFLAGS="${LDFLAGS} -static"
pre-patch:
@${CP} ${DISTDIR}/untar.c ${WRKSRC}
- @${CP} ${FILESDIR}/Makefile.untar ${WRKSRC}/Makefile
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PROG} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
.include <bsd.port.mk>
diff --git a/archivers/untar/files/Makefile.untar b/archivers/untar/files/Makefile.untar
deleted file mode 100644
index 8a7e04645b6a..000000000000
--- a/archivers/untar/files/Makefile.untar
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile for untar-1.4
-# For FreeBSD-[43].X
-
-PROG= untar
-SRCS= untar.c
-NOMAN= yes
-
-CFLAGS+= -D_POSIX_SOURCE
-LDFLAGS+= -static
-
-.include <bsd.prog.mk>