Attachment #26996 for bug #45926

View | Details | Raw Unified | Return to bug 45926
Collapse All | Expand All





MAINTAINER=	ports@FreeBSD.org

ALL_TARGET=	${PORTNAME}
MAN1=		cdecl.1
MLINKS=		cdecl.1 c++decl.1

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/testset* ${DOCSDIR}
.endif

.include <bsd.port.mk>




--- Makefile.orig	Tue Jan 16 14:36:38 1996
+++ Makefile	Sat Nov 30 22:45:23 2002
@@ -15,13 +15,13 @@
 #
 # add -DUSE_READLINE	To compile in support for the GNU readline library.

-CATDIR= /usr/man/cat1
+BINDIR= $(PREFIX)/bin
+MANDIR= $(PREFIX)/man/man1
+CATDIR= $(PREFIX)/man/cat1
 INSTALL= install -c
 INSTALL_DATA= install -c -m 644
 
@@ -43,10 +43,10 @@
 	./c++decl < testset++
 
 install: cdecl
-	$(INSTALL) cdecl $(BINDIR)
+	${BSD_INSTALL_PROGRAM} cdecl $(BINDIR)
 	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
-	$(INSTALL_DATA) cdecl.1 $(MANDIR)
-	$(INSTALL_DATA) c++decl.1 $(MANDIR)
+	${BSD_INSTALL_MAN} cdecl.1 $(MANDIR)
+	${BSD_INSTALL_MAN} c++decl.1 $(MANDIR)
 
 clean:
 	rm -f cdgram.c cdlex.c cdecl y.output c++decl

Lines 1-6 Link Here

(-)devel/cdecl/pkg-plist (-3 / +3 lines)
1	@comment $FreeBSD: ports/devel/cdecl/pkg-plist,v 1.3 2000/11/22 00:17:12 obrien Exp $	1	@comment $FreeBSD: ports/devel/cdecl/pkg-plist,v 1.3 2000/11/22 00:17:12 obrien Exp $
2	bin/cdecl	2	bin/cdecl
3	bin/c++decl	3	bin/c++decl
4	share/doc/cdecl/testset	4	%%PORTDOCS%%share/doc/cdecl/testset
5	share/doc/cdecl/testset++	5	%%PORTDOCS%%share/doc/cdecl/testset++
6	@dirrm share/doc/cdecl	6	%%PORTDOCS%%@dirrm share/doc/cdecl

Return to bug 45926

Lines 17-30 Link Here

(-)devel/cdecl/Makefile (-3 / +3 lines)
17		17
18	MAINTAINER= ports@FreeBSD.org	18	MAINTAINER= ports@FreeBSD.org
19		19
20	ALL_TARGET=	20	ALL_TARGET= ${PORTNAME}
21	MAN1= cdecl.1	21	MAN1= cdecl.1
22	MLINKS= cdecl.1 c++decl.1	22	MLINKS= cdecl.1 c++decl.1
23		23
24	post-install:	24	post-install:
25	.if !defined(NOPORTDOCS)	25	.if !defined(NOPORTDOCS)
26	@${MKDIR} ${PREFIX}/share/doc/cdecl	26	@${MKDIR} ${DOCSDIR}
27	${INSTALL_DATA} ${WRKSRC}/testset* ${PREFIX}/share/doc/cdecl	27	${INSTALL_DATA} ${WRKSRC}/testset* ${DOCSDIR}
28	.endif	28	.endif
29		29
30	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)devel/cdecl/files/patch-01 (-3 / +17 lines)
1	--- Makefile.orig Mon Jan 15 21:36:38 1996	1	--- Makefile.orig Tue Jan 16 14:36:38 1996
2	+++ Makefile Sun Feb 13 21:21:04 2000	2	+++ Makefile Sat Nov 30 22:45:23 2002
3	@@ -15,13 +15,13 @@	3	@@ -15,13 +15,13 @@
4	#	4	#
5	# add -DUSE_READLINE To compile in support for the GNU readline library.	5	# add -DUSE_READLINE To compile in support for the GNU readline library.
Lines 15-21 Link Here
15	-CATDIR= /usr/man/cat1	15	-CATDIR= /usr/man/cat1
16	+BINDIR= $(PREFIX)/bin	16	+BINDIR= $(PREFIX)/bin
17	+MANDIR= $(PREFIX)/man/man1	17	+MANDIR= $(PREFIX)/man/man1
18	+CATDIR= $(PREFIX/usr/man/cat1	18	+CATDIR= $(PREFIX)/man/cat1
19	INSTALL= install -c	19	INSTALL= install -c
20	INSTALL_DATA= install -c -m 644	20	INSTALL_DATA= install -c -m 644
21		21
		22	@@ -43,10 +43,10 @@
		23	./c++decl < testset++
		24
		25	install: cdecl
		26	- $(INSTALL) cdecl $(BINDIR)
		27	+ ${BSD_INSTALL_PROGRAM} cdecl $(BINDIR)
		28	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
		29	- $(INSTALL_DATA) cdecl.1 $(MANDIR)
		30	- $(INSTALL_DATA) c++decl.1 $(MANDIR)
		31	+ ${BSD_INSTALL_MAN} cdecl.1 $(MANDIR)
		32	+ ${BSD_INSTALL_MAN} c++decl.1 $(MANDIR)
		33
		34	clean:
		35	rm -f cdgram.c cdlex.c cdecl y.output c++decl