Attachment #88097 for bug #124845

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




#

PORTNAME=	fhist
PORTVERSION=	1.17
CATEGORIES=	devel
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Utilities to maintain file history, do file comparisions and merges

OPTIONS=	NLS "Use Native Language Support" on

USE_GNOME=	gnometarget
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
ALL_TARGET=	binaries po

MAN1=		fcomp.1 fhist.1 fmerge.1
PLIST_FILES=	bin/fcomp bin/fhist bin/fmerge
INSTALL_TARGET=	install-bin

CFLAGS+=	-I${LOCALBASE}/include
CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib

.include <bsd.port.pre.mk>

.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=	ac_cv_lib_intl_main=no
.else
USE_GETTEXT=	yes
PLIST_FILES+=	share/locale/en/LC_MESSAGES/fcomp.mo \
		share/locale/en/LC_MESSAGES/fhist.mo \
		share/locale/en/LC_MESSAGES/fmerge.mo
.endif

post-extract:
	cd ${WRKSRC}/lib/en/man1 && ${LN} -s ${WRKSRC}/etc/*.so .

do-install:
.for file in fhist fcomp fmerge
	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/bin/${file}
	(cd ${WRKSRC}/lib/en/man1; soelim ${file}.1 > tmp; \
	${INSTALL_MAN} tmp ${PREFIX}/man/man1/${file}.1)
.if !defined(WITHOUT_NLS)
	@${MKDIR} ${PREFIX}/share/locale/en/LC_MESSAGES
	${INSTALL_DATA} ${WRKSRC}/lib/en/LC_MESSAGES/${file}.mo \
		 ${PREFIX}/share/locale/en/LC_MESSAGES/${file}.mo
.endif
.endfor

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)devel/fhist/distinfo (-3 / +3 lines)
1	MD5 (fhist-1.16.tar.gz) = b9ab632eace455b440e83910f62fea62	1	MD5 (fhist-1.17.tar.gz) = 4a28cd28cdecdba0ba28ae2c03e3eebf
2	SHA256 (fhist-1.16.tar.gz) = 57c8056fa347d5b9a545253ed0b10d5e8429cd829a9dac9bd8709a43fd523413	2	SHA256 (fhist-1.17.tar.gz) = e1e06a095913e9d9afc2deb89f646d96dd03d2d832669018f3cc519fffb98e1e
3	SIZE (fhist-1.16.tar.gz) = 273203	3	SIZE (fhist-1.17.tar.gz) = 401116




--- Makefile.in--	Wed Jan  5 21:12:04 2000
+++ Makefile.in	Wed Jan  5 21:13:41 2000
@@ -715,46 +715,46 @@
 	$(INSTALL_DATA) lib/en/building.txt $@
 
 $(datadir)/en/man1/fcomp.1: lib/en/man1/fcomp.1 lib/en/man1/.datadir
-	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fcomp.1 > tmp
+	$(SOELIM) lib/en/man1/fcomp.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp
 
 $(mandir)/man1/fcomp.1: lib/$(MANLANG)/man1/fcomp.1  lib/en/man1/.mandir
-	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc lib/$(MANLANG)/man1/fcomp.1 > tmp
+	$(SOELIM) lib/$(MANLANG)/man1/fcomp.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp
 
 $(datadir)/en/man1/fhist.1: lib/en/man1/fhist.1 lib/en/man1/.datadir
-	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fhist.1 > tmp
+	$(SOELIM) lib/en/man1/fhist.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp
 
 $(mandir)/man1/fhist.1: lib/$(MANLANG)/man1/fhist.1  lib/en/man1/.mandir
-	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc lib/$(MANLANG)/man1/fhist.1 > tmp
+	$(SOELIM) lib/$(MANLANG)/man1/fhist.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp
 
 $(datadir)/en/man1/fhist_lic.1: lib/en/man1/fhist_lic.1 \
 		lib/en/man1/.datadir
-	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fhist_lic.1 > tmp
+	$(SOELIM) lib/en/man1/fhist_lic.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp
 
 $(mandir)/man1/fhist_lic.1: lib/$(MANLANG)/man1/fhist_lic.1 \
 		lib/en/man1/.mandir
-	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc \
+	$(SOELIM) \
 		lib/$(MANLANG)/man1/fhist_lic.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp
 
 $(datadir)/en/man1/fmerge.1: lib/en/man1/fmerge.1 lib/en/man1/.datadir
-	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fmerge.1 > tmp
+	$(SOELIM) lib/en/man1/fmerge.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp
 
 $(mandir)/man1/fmerge.1: lib/$(MANLANG)/man1/fmerge.1 \
 		lib/en/man1/.mandir
-	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc \
+	$(SOELIM) \
 		lib/$(MANLANG)/man1/fmerge.1 > tmp
 	$(INSTALL_DATA) tmp $@
 	@rm -f tmp

Lines 1-3 Link Here

(-)devel/fhist/pkg-plist (-3 lines)
1	bin/fcomp
2	bin/fhist
3	bin/fmerge

Return to bug 124845

Lines 6-36 Link Here

(-)devel/fhist/Makefile (-10 / +30 lines)
6	#	6	#
7		7
8	PORTNAME= fhist	8	PORTNAME= fhist
9	PORTVERSION= 1.16	9	PORTVERSION= 1.17
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= SF
12	MASTER_SITE_SUBDIR= ${PORTNAME}
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Utilities to maintain file history, do file comparisions and merges	14	COMMENT= Utilities to maintain file history, do file comparisions and merges
16		15
17	.include <bsd.port.pre.mk>	16	OPTIONS= NLS "Use Native Language Support" on
		17
		18	USE_GNOME= gnometarget
		19	GNU_CONFIGURE= yes
		20	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		21	ALL_TARGET= binaries po
18		22
19	MAN1= fcomp.1 fhist.1 fmerge.1	23	MAN1= fcomp.1 fhist.1 fmerge.1
20	ALL_TARGET= binaries	24	PLIST_FILES= bin/fcomp bin/fhist bin/fmerge
21	INSTALL_TARGET= install-bin
22		25
23	GNU_CONFIGURE= yes	26	CFLAGS+= -I${LOCALBASE}/include
24	CONFIGURE_ARGS= --includedir=${PREFIX}/include	27	CPPFLAGS= -I${LOCALBASE}/include
		28	LDFLAGS= -L${LOCALBASE}/lib
		29
		30	.include <bsd.port.pre.mk>
		31
		32	.if defined(WITHOUT_NLS)
		33	CONFIGURE_ARGS+= ac_cv_lib_intl_main=no
		34	.else
		35	USE_GETTEXT= yes
		36	PLIST_FILES+= share/locale/en/LC_MESSAGES/fcomp.mo \
		37	share/locale/en/LC_MESSAGES/fhist.mo \
		38	share/locale/en/LC_MESSAGES/fmerge.mo
		39	.endif
25		40
26	post-extract:	41	post-extract:
27	cd ${WRKSRC}/lib/en/man1 && ${LN} -s ${WRKSRC}/etc/*.so .	42	cd ${WRKSRC}/lib/en/man1 && ${LN} -s ${WRKSRC}/etc/*.so .
28		43
29	post-install:	44	do-install:
30	.for file in fhist fcomp fmerge	45	.for file in fhist fcomp fmerge
31	${STRIP_CMD} ${PREFIX}/bin/${file}	46	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/bin/${file}
32	(cd ${WRKSRC}/lib/en/man1; soelim ${file}.1 > tmp; \	47	(cd ${WRKSRC}/lib/en/man1; soelim ${file}.1 > tmp; \
33	${INSTALL_MAN} tmp ${PREFIX}/man/man1/${file}.1)	48	${INSTALL_MAN} tmp ${PREFIX}/man/man1/${file}.1)
		49	.if !defined(WITHOUT_NLS)
		50	@${MKDIR} ${PREFIX}/share/locale/en/LC_MESSAGES
		51	${INSTALL_DATA} ${WRKSRC}/lib/en/LC_MESSAGES/${file}.mo \
		52	${PREFIX}/share/locale/en/LC_MESSAGES/${file}.mo
		53	.endif
34	.endfor	54	.endfor
35		55
36	.include <bsd.port.post.mk>	56	.include <bsd.port.post.mk>

Lines 1-57 Link Here

(-)devel/fhist/files/patch-aa (-57 lines)
1	--- Makefile.in-- Wed Jan 5 21:12:04 2000
2	+++ Makefile.in Wed Jan 5 21:13:41 2000
3	@@ -715,46 +715,46 @@
4	$(INSTALL_DATA) lib/en/building.txt $@
5
6	$(datadir)/en/man1/fcomp.1: lib/en/man1/fcomp.1 lib/en/man1/.datadir
7	- $(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fcomp.1 > tmp
8	+ $(SOELIM) lib/en/man1/fcomp.1 > tmp
9	$(INSTALL_DATA) tmp $@
10	@rm -f tmp
11
12	$(mandir)/man1/fcomp.1: lib/$(MANLANG)/man1/fcomp.1 lib/en/man1/.mandir
13	- $(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc lib/$(MANLANG)/man1/fcomp.1 > tmp
14	+ $(SOELIM) lib/$(MANLANG)/man1/fcomp.1 > tmp
15	$(INSTALL_DATA) tmp $@
16	@rm -f tmp
17
18	$(datadir)/en/man1/fhist.1: lib/en/man1/fhist.1 lib/en/man1/.datadir
19	- $(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fhist.1 > tmp
20	+ $(SOELIM) lib/en/man1/fhist.1 > tmp
21	$(INSTALL_DATA) tmp $@
22	@rm -f tmp
23
24	$(mandir)/man1/fhist.1: lib/$(MANLANG)/man1/fhist.1 lib/en/man1/.mandir
25	- $(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc lib/$(MANLANG)/man1/fhist.1 > tmp
26	+ $(SOELIM) lib/$(MANLANG)/man1/fhist.1 > tmp
27	$(INSTALL_DATA) tmp $@
28	@rm -f tmp
29
30	$(datadir)/en/man1/fhist_lic.1: lib/en/man1/fhist_lic.1 \
31	lib/en/man1/.datadir
32	- $(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fhist_lic.1 > tmp
33	+ $(SOELIM) lib/en/man1/fhist_lic.1 > tmp
34	$(INSTALL_DATA) tmp $@
35	@rm -f tmp
36
37	$(mandir)/man1/fhist_lic.1: lib/$(MANLANG)/man1/fhist_lic.1 \
38	lib/en/man1/.mandir
39	- $(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc \
40	+ $(SOELIM) \
41	lib/$(MANLANG)/man1/fhist_lic.1 > tmp
42	$(INSTALL_DATA) tmp $@
43	@rm -f tmp
44
45	$(datadir)/en/man1/fmerge.1: lib/en/man1/fmerge.1 lib/en/man1/.datadir
46	- $(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fmerge.1 > tmp
47	+ $(SOELIM) lib/en/man1/fmerge.1 > tmp
48	$(INSTALL_DATA) tmp $@
49	@rm -f tmp
50
51	$(mandir)/man1/fmerge.1: lib/$(MANLANG)/man1/fmerge.1 \
52	lib/en/man1/.mandir
53	- $(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc \
54	+ $(SOELIM) \
55	lib/$(MANLANG)/man1/fmerge.1 > tmp
56	$(INSTALL_DATA) tmp $@
57	@rm -f tmp