aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2000-06-10 06:48:25 +0800
committerwill <will@FreeBSD.org>2000-06-10 06:48:25 +0800
commita7f915f22d371c0ee53e4eeea835120abab66eb3 (patch)
treeef486e095518a18aae7e0fbf392d32d3793c987c
parent782774880a61123af67e577d1708154d78aed7a5 (diff)
downloadfreebsd-ports-gnome-a7f915f22d371c0ee53e4eeea835120abab66eb3.tar.gz
freebsd-ports-gnome-a7f915f22d371c0ee53e4eeea835120abab66eb3.tar.zst
freebsd-ports-gnome-a7f915f22d371c0ee53e4eeea835120abab66eb3.zip
Minor clenaups. Use BSD_INSTALL_* macros.
PR: 19157 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp> via MAINTAINER
-rw-r--r--graphics/jbigkit/Makefile3
-rw-r--r--graphics/jbigkit/files/patch-aa27
2 files changed, 15 insertions, 15 deletions
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index a2e490a2663a..beeaddb4f8eb 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.informatik.uni-erlangen.de/pub/doc/ISO/JBIG/
MAINTAINER= mi@aldan.algebra.com
-WRKSRC= ${WRKDIR}/jbigkit
+WRKSRC= ${WRKDIR}/${PORTNAME}
MAN1= jbgtopbm.1 pbmtojbg.1
-MAN5= pgm.5
post-install:
.if !defined(NOPORTDOCS)
diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa
index d6dacafe86da..b029aa06c113 100644
--- a/graphics/jbigkit/files/patch-aa
+++ b/graphics/jbigkit/files/patch-aa
@@ -16,29 +16,30 @@
+
VERSION=1.0
-@@ -46,2 +47,25 @@
+@@ -46,2 +47,26 @@
$(DISTUID)@$(DISTHOST):$(DISTPATH)/jbigkit-$(VERSION)-announce.txt
mv ../jbigkit-$(VERSION).tar.gz $(HOME)/.www/download/
+
+install:
+ mkdir -p ${PREFIX}/bin
-+ install -c -s -m 755 -o bin -g bin pbmtools/jbgtopbm ${PREFIX}/bin
-+ install -c -s -m 755 -o bin -g bin pbmtools/pbmtojbg ${PREFIX}/bin
++ ${BSD_INSTALL_PROGRAM} pbmtools/jbgtopbm pbmtools/pbmtojbg \
++ ${PREFIX}/bin
+ mkdir -p ${PREFIX}/man/man1
-+ install -c -m 644 -o bin -g bin pbmtools/pbmtojbg.1 ${PREFIX}/man/man1
-+ install -c -m 644 -o bin -g bin pbmtools/jbgtopbm.1 ${PREFIX}/man/man1
-+ mkdir -p ${PREFIX}/man/man5
++ ${BSD_INSTALL_MAN} pbmtools/pbmtojbg.1 pbmtools/jbgtopbm.1 \
++ ${PREFIX}/man/man1
++ # mkdir -p ${PREFIX}/man/man5
+ # Not installing the pbm(5) man page, because BSD has its own
+ # install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5
-+ install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
++ # Not installing the pgm(5) man page for it comes with netpbm port
++ # install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
+ mkdir -p ${PREFIX}/include
-+ install -c -m 644 -o bin -g bin libjbig/jbig.h ${PREFIX}/include
++ ${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include
+ mkdir -p ${PREFIX}/lib
-+ install -c -m 644 -o bin -g bin libjbig/libjbig.a ${PREFIX}/lib
++ ${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib
+.if ${PORTOBJFORMAT} == elf
-+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1 ${PREFIX}/lib
-+ (cd ${PREFIX}/lib; ln -sf libjbig.so.1 libjbig.so)
++ ${BSD_INSTALL_DATA} libjbig/libjbig.so.1 ${PREFIX}/lib
++ ln -sf libjbig.so.1 ${PREFIX}/lib/libjbig.so
+.else
-+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1.1 ${PREFIX}/lib
-+ (cd ${PREFIX}/lib; ln -sf libjbig.so.1.1 libjbig.so)
++ ${BSD_INSTALL_DATA} libjbig/libjbig.so.1.1 ${PREFIX}/lib
++ ln -sf libjbig.so.1.1 ${PREFIX}/lib/libjbig.so
+.endif