diff options
| author | mi <mi@FreeBSD.org> | 2002-03-02 22:47:19 +0000 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2002-03-02 22:47:19 +0000 |
| commit | 76b5ce59bccdffb233ac4ae5c01b51209a6f98d0 (patch) | |
| tree | 55fc6b5e2f3a236a474ab6150c70aea60b9fead3 | |
| parent | 01d81abb20583663462a0f5e49766e53c81c19d0 (diff) | |
| download | FreeBSD-ports-76b5ce59bccdffb233ac4ae5c01b51209a6f98d0.zip FreeBSD-ports-76b5ce59bccdffb233ac4ae5c01b51209a6f98d0.tar.gz | |
Obey CC/CFLAGS fully. Use INSTALL_PROGRAM instead of CP to install
the binaries. Install the README and README.html into DOCSDIR, unless
NOPORTDOCS is set. Bump up PORTREVISION.
| -rw-r--r-- | graphics/vcdtools/Makefile | 9 | ||||
| -rw-r--r-- | graphics/vcdtools/files/patch-Makefile | 17 | ||||
| -rw-r--r-- | graphics/vcdtools/pkg-plist | 3 | ||||
| -rw-r--r-- | multimedia/vcdtools/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/vcdtools/files/patch-Makefile | 17 | ||||
| -rw-r--r-- | multimedia/vcdtools/pkg-plist | 3 |
6 files changed, 46 insertions, 12 deletions
diff --git a/graphics/vcdtools/Makefile b/graphics/vcdtools/Makefile index 42172a7..d5997b6 100644 --- a/graphics/vcdtools/Makefile +++ b/graphics/vcdtools/Makefile @@ -8,6 +8,7 @@ PORTNAME= vcdtools PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.mpegnews.com/files/video/ DISTNAME= ${PORTNAME}_v${PORTVERSION} @@ -17,8 +18,10 @@ MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} do-install: -.for f in mkvcdfs vcdmplex - @${CP} ${WRKSRC}/$f ${PREFIX}/bin -.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/mkvcdfs ${WRKSRC}/vcdmplex ${PREFIX}/bin +.ifndef NOPORTDOCS + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR} +.endif .include <bsd.port.mk> diff --git a/graphics/vcdtools/files/patch-Makefile b/graphics/vcdtools/files/patch-Makefile index 5404234..dc76565 100644 --- a/graphics/vcdtools/files/patch-Makefile +++ b/graphics/vcdtools/files/patch-Makefile @@ -1,7 +1,18 @@ ---- Makefile.orig Fri Mar 9 01:43:44 2001 -+++ Makefile Fri Mar 9 01:43:47 2001 -@@ -1,4 +1,3 @@ +--- Makefile Fri Mar 24 17:57:31 2000 ++++ Makefile Sat Mar 2 17:39:52 2002 +@@ -1,14 +1,10 @@ -CFLAGS = -O2 OBJS = mkvcdfs.o vcdisofs.o edc_ecc.o + all: mkvcdfs vcdmplex + + mkvcdfs: $(OBJS) +- cc -o mkvcdfs $(OBJS) +- +-vcdmplex: vcdmplex.c +- cc -O2 -o vcdmplex vcdmplex.c ++ ${CC} -o mkvcdfs $(OBJS) + + clean: + rm -f *.o mkvcdfs vcdmplex diff --git a/graphics/vcdtools/pkg-plist b/graphics/vcdtools/pkg-plist index 816b115..429bbd5 100644 --- a/graphics/vcdtools/pkg-plist +++ b/graphics/vcdtools/pkg-plist @@ -1,2 +1,5 @@ bin/mkvcdfs bin/vcdmplex +%%PORTDOCS%%share/doc/vcdtools/README +%%PORTDOCS%%share/doc/vcdtools/README.html +%%PORTDOCS%%@dirrm share/doc/vcdtools diff --git a/multimedia/vcdtools/Makefile b/multimedia/vcdtools/Makefile index 42172a7..d5997b6 100644 --- a/multimedia/vcdtools/Makefile +++ b/multimedia/vcdtools/Makefile @@ -8,6 +8,7 @@ PORTNAME= vcdtools PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.mpegnews.com/files/video/ DISTNAME= ${PORTNAME}_v${PORTVERSION} @@ -17,8 +18,10 @@ MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} do-install: -.for f in mkvcdfs vcdmplex - @${CP} ${WRKSRC}/$f ${PREFIX}/bin -.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/mkvcdfs ${WRKSRC}/vcdmplex ${PREFIX}/bin +.ifndef NOPORTDOCS + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR} +.endif .include <bsd.port.mk> diff --git a/multimedia/vcdtools/files/patch-Makefile b/multimedia/vcdtools/files/patch-Makefile index 5404234..dc76565 100644 --- a/multimedia/vcdtools/files/patch-Makefile +++ b/multimedia/vcdtools/files/patch-Makefile @@ -1,7 +1,18 @@ ---- Makefile.orig Fri Mar 9 01:43:44 2001 -+++ Makefile Fri Mar 9 01:43:47 2001 -@@ -1,4 +1,3 @@ +--- Makefile Fri Mar 24 17:57:31 2000 ++++ Makefile Sat Mar 2 17:39:52 2002 +@@ -1,14 +1,10 @@ -CFLAGS = -O2 OBJS = mkvcdfs.o vcdisofs.o edc_ecc.o + all: mkvcdfs vcdmplex + + mkvcdfs: $(OBJS) +- cc -o mkvcdfs $(OBJS) +- +-vcdmplex: vcdmplex.c +- cc -O2 -o vcdmplex vcdmplex.c ++ ${CC} -o mkvcdfs $(OBJS) + + clean: + rm -f *.o mkvcdfs vcdmplex diff --git a/multimedia/vcdtools/pkg-plist b/multimedia/vcdtools/pkg-plist index 816b115..429bbd5 100644 --- a/multimedia/vcdtools/pkg-plist +++ b/multimedia/vcdtools/pkg-plist @@ -1,2 +1,5 @@ bin/mkvcdfs bin/vcdmplex +%%PORTDOCS%%share/doc/vcdtools/README +%%PORTDOCS%%share/doc/vcdtools/README.html +%%PORTDOCS%%@dirrm share/doc/vcdtools |
