diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-09-27 14:17:52 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-09-27 14:17:52 +0000 |
| commit | c7f405e3420494a024417ee7ea3fc9fa8ec2b96c (patch) | |
| tree | 5617a5a0e4e907be1e87fadaa5bdd2702511dcb3 /archivers | |
| parent | b4f47f96893ed4fbeb1081ade12513a7665c6323 (diff) | |
| download | ports-c7f405e3420494a024417ee7ea3fc9fa8ec2b96c.tar.gz ports-c7f405e3420494a024417ee7ea3fc9fa8ec2b96c.zip | |
Cleanup, use MAKE_ARGS instead of Makefile-patch
Notes
Notes:
svn path=/head/; revision=143628
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/lbrate/Makefile | 10 | ||||
| -rw-r--r-- | archivers/lbrate/files/patch-Makefile | 28 |
2 files changed, 3 insertions, 35 deletions
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile index 1611040f1b55..2e602ed6317b 100644 --- a/archivers/lbrate/Makefile +++ b/archivers/lbrate/Makefile @@ -16,22 +16,18 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Extract/decompress CP/M LBR archives USE_GETOPT_LONG= yes -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" MAN1= lbrate.1 -PORTDOCS= ${DOC_FILES} +PORTDOCS= ChangeLog README TODO PLIST_FILES= bin/lbrate -DOC_FILES= ChangeLog README TODO - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lbrate ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/lbrate.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for FILE in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) .endif .include <bsd.port.mk> diff --git a/archivers/lbrate/files/patch-Makefile b/archivers/lbrate/files/patch-Makefile deleted file mode 100644 index ce621f678462..000000000000 --- a/archivers/lbrate/files/patch-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig Fri Aug 31 01:03:17 2001 -+++ Makefile Sun Jul 6 05:09:19 2003 -@@ -1,13 +1,13 @@ - # Makefile - makefile for lbrate - --CC=gcc --CFLAGS=-O2 -Wall -+CC?= gcc -+CFLAGS+=$(CPPFLAGS) - - # Set BINDIR to directory for binary, - # MANDIR to directory for man page. - # Usually it will be simpler to just set PREFIX. - # --PREFIX=/usr/local -+PREFIX?=/usr/local - BINDIR=$(PREFIX)/bin - MANDIR=$(PREFIX)/man/man1 - -@@ -19,7 +19,7 @@ - all: lbrate - - lbrate: $(OBJ) -- $(CC) $(CFLAGS) -o lbrate $(OBJ) -+ $(CC) $(CFLAGS) -o lbrate $(OBJ) $(LDFLAGS) - - installdirs: - /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR) |