Attachment #58043 for bug #87536

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

Lines 6-13 Link Here

(-)graphics/flphoto/Makefile (-5 / +24 lines)
6	#	6	#
7		7
8	PORTNAME= flphoto	8	PORTNAME= flphoto
9	PORTVERSION= 1.1	9	PORTVERSION= 1.2
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= fltk	12	MASTER_SITE_SUBDIR= fltk
Lines 19-31 Link Here
19	LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \	18	LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
20	fltk.1:${PORTSDIR}/x11-toolkits/fltk	19	fltk.1:${PORTSDIR}/x11-toolkits/fltk
21		20
22	USE_X_PREFIX= yes	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		22
23	USE_BZIP2= yes	23	USE_BZIP2= yes
		24	USE_X_PREFIX= yes
		25	USE_REINPLACE= yes
24	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
25		27	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27		28
28	MAN1= flphoto.1	29	MAN1= flphoto.1
29	MAN5= album.5	30	MAN5= album.5
		31
		32	post-patch:
		33	@${REINPLACE_CMD} -e 's\|@OPTIM@\|-DHAVE_CONFIG_H\|g' ${WRKSRC}/Makefile.in
		34
		35	do-install:
		36	${INSTALL_PROGRAM} ${WRKSRC}/flphoto ${PREFIX}/bin/flphoto
		37	${INSTALL_MAN} ${WRKSRC}/doc/flphoto.man ${MANPREFIX}/man/man1/flphoto.1
		38	${INSTALL_MAN} ${WRKSRC}/doc/album.man ${MAN5PREFIX}/man/man5/album.5
		39	@${MKDIR} ${DOCSDIR}
		40	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
		41	${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${DOCSDIR}
		42	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
		43	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
		44	.for lang in de en_CA en_GB es fr it nl pt
		45	@${MKDIR} ${PREFIX}/share/locale/${lang}
		46	${INSTALL_DATA} ${WRKSRC}/po/${lang}.po \
		47	${PREFIX}/share/locale/${lang}/flphoto_${lang}
		48	.endfor
30		49
31	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/flphoto/distinfo (-2 / +2 lines)
1	MD5 (flphoto-1.1-source.tar.bz2) = 2cf2938ea1c6f88f9df279a77ec8af96	1	MD5 (flphoto-1.2-source.tar.bz2) = 13c9b6803b2fd159e8f082b7735ce8ab
2	SIZE (flphoto-1.1-source.tar.bz2) = 408538	2	SIZE (flphoto-1.2-source.tar.bz2) = 501459




--- Makefile.in.orig	Sun Sep 14 01:00:35 2003
+++ Makefile.in	Mon Dec  8 20:48:49 2003
@@ -182,15 +182,9 @@
 	$(CP) flphoto$(EXEEXT) $(DESTDIR)$(bindir)
 	$(FLTKCONFIG) --post $(DESTDIR)$(bindir)/flphoto$(EXEEXT)
 	echo Installing flPhoto manpages in $(DESTDIR)$(mandir)
-	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
-	$(RM) $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
-	$(CP) $(srcdir)/doc/flphoto.1 $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
 	-$(MKDIR) $(DESTDIR)$(mandir)/man1
 	$(RM) $(DESTDIR)$(mandir)/man1/flphoto.1
 	$(CP) $(srcdir)/doc/flphoto.man $(DESTDIR)$(mandir)/man1/flphoto.1
-	-$(MKDIR) $(DESTDIR)$(mandir)/cat5
-	$(RM) $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
-	$(CP) $(srcdir)/doc/album.5 $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
 	-$(MKDIR) $(DESTDIR)$(mandir)/man5
 	$(RM) $(DESTDIR)$(mandir)/man5/album.5
 	$(CP) $(srcdir)/doc/album.man $(DESTDIR)$(mandir)/man5/album.5




bin/flphoto
%%DOCSDIR%%/README
%%DOCSDIR%%/about.html
%%DOCSDIR%%/albums.html
%%DOCSDIR%%/camera.jpg
%%DOCSDIR%%/contents.html
%%DOCSDIR%%/crop.jpg
%%DOCSDIR%%/download.html
%%DOCSDIR%%/export.html
%%DOCSDIR%%/export.jpg
%%DOCSDIR%%/flphoto.jpg
%%DOCSDIR%%/flphoto.png
%%DOCSDIR%%/images.html
%%DOCSDIR%%/import.html
%%DOCSDIR%%/index.html
%%DOCSDIR%%/jpeg.jpg
%%DOCSDIR%%/license.html
%%DOCSDIR%%/options.html
%%DOCSDIR%%/options1.jpg
%%DOCSDIR%%/options2.jpg
%%DOCSDIR%%/options3.jpg
%%DOCSDIR%%/print.html
%%DOCSDIR%%/print.jpg
%%DOCSDIR%%/print2.jpg
%%DOCSDIR%%/print3.jpg
%%DOCSDIR%%/print4.jpg
%%DOCSDIR%%/relnotes.html
%%DOCSDIR%%/scale.jpg
%%DOCSDIR%%/slideshow.html
%%DOCSDIR%%/slideshow.jpg
%%DOCSDIR%%/view.html
share/locale/de/flphoto_de
share/locale/en_CA/flphoto_en_CA
share/locale/en_GB/flphoto_en_GB

share/locale/it/flphoto_it
share/locale/nl/flphoto_nl
share/locale/pt/flphoto_pt
@dirrm %%DOCSDIR%%

Return to bug 87536

Lines 1-18 Link Here

(-)graphics/flphoto/files/patch-Makefile.in (-18 lines)
1	--- Makefile.in.orig Sun Sep 14 01:00:35 2003
2	+++ Makefile.in Mon Dec 8 20:48:49 2003
3	@@ -182,15 +182,9 @@
4	$(CP) flphoto$(EXEEXT) $(DESTDIR)$(bindir)
5	$(FLTKCONFIG) --post $(DESTDIR)$(bindir)/flphoto$(EXEEXT)
6	echo Installing flPhoto manpages in $(DESTDIR)$(mandir)
7	- -$(MKDIR) $(DESTDIR)$(mandir)/cat1
8	- $(RM) $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
9	- $(CP) $(srcdir)/doc/flphoto.1 $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
10	-$(MKDIR) $(DESTDIR)$(mandir)/man1
11	$(RM) $(DESTDIR)$(mandir)/man1/flphoto.1
12	$(CP) $(srcdir)/doc/flphoto.man $(DESTDIR)$(mandir)/man1/flphoto.1
13	- -$(MKDIR) $(DESTDIR)$(mandir)/cat5
14	- $(RM) $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
15	- $(CP) $(srcdir)/doc/album.5 $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
16	-$(MKDIR) $(DESTDIR)$(mandir)/man5
17	$(RM) $(DESTDIR)$(mandir)/man5/album.5
18	$(CP) $(srcdir)/doc/album.man $(DESTDIR)$(mandir)/man5/album.5

Lines 1-31 Link Here

(-)graphics/flphoto/pkg-plist (-28 / +31 lines)
1	bin/flphoto	1	bin/flphoto
2	share/doc/flphoto/COPYING	2	%%DOCSDIR%%/README
3	share/doc/flphoto/README	3	%%DOCSDIR%%/about.html
4	share/doc/flphoto/about.html	4	%%DOCSDIR%%/albums.html
5	share/doc/flphoto/slideshow.html	5	%%DOCSDIR%%/camera.jpg
6	share/doc/flphoto/relnotes.html	6	%%DOCSDIR%%/contents.html
7	share/doc/flphoto/print.html	7	%%DOCSDIR%%/crop.jpg
8	share/doc/flphoto/license.html	8	%%DOCSDIR%%/download.html
9	share/doc/flphoto/index.html	9	%%DOCSDIR%%/export.html
10	share/doc/flphoto/import.html	10	%%DOCSDIR%%/export.jpg
11	share/doc/flphoto/images.html	11	%%DOCSDIR%%/flphoto.jpg
12	share/doc/flphoto/export.html	12	%%DOCSDIR%%/flphoto.png
13	share/doc/flphoto/download.html	13	%%DOCSDIR%%/images.html
14	share/doc/flphoto/contents.html	14	%%DOCSDIR%%/import.html
15	share/doc/flphoto/albums.html	15	%%DOCSDIR%%/index.html
16	share/doc/flphoto/view.html	16	%%DOCSDIR%%/jpeg.jpg
17	share/doc/flphoto/camera.jpg	17	%%DOCSDIR%%/license.html
18	share/doc/flphoto/scale.jpg	18	%%DOCSDIR%%/options.html
19	share/doc/flphoto/print4.jpg	19	%%DOCSDIR%%/options1.jpg
20	share/doc/flphoto/print3.jpg	20	%%DOCSDIR%%/options2.jpg
21	share/doc/flphoto/print2.jpg	21	%%DOCSDIR%%/options3.jpg
22	share/doc/flphoto/print.jpg	22	%%DOCSDIR%%/print.html
23	share/doc/flphoto/jpeg.jpg	23	%%DOCSDIR%%/print.jpg
24	share/doc/flphoto/flphoto.jpg	24	%%DOCSDIR%%/print2.jpg
25	share/doc/flphoto/export.jpg	25	%%DOCSDIR%%/print3.jpg
26	share/doc/flphoto/crop.jpg	26	%%DOCSDIR%%/print4.jpg
27	share/doc/flphoto/slideshow.jpg	27	%%DOCSDIR%%/relnotes.html
28	share/doc/flphoto/flphoto.png	28	%%DOCSDIR%%/scale.jpg
		29	%%DOCSDIR%%/slideshow.html
		30	%%DOCSDIR%%/slideshow.jpg
		31	%%DOCSDIR%%/view.html
29	share/locale/de/flphoto_de	32	share/locale/de/flphoto_de
30	share/locale/en_CA/flphoto_en_CA	33	share/locale/en_CA/flphoto_en_CA
31	share/locale/en_GB/flphoto_en_GB	34	share/locale/en_GB/flphoto_en_GB
Lines 34-37 Link Here
34	share/locale/it/flphoto_it	37	share/locale/it/flphoto_it
35	share/locale/nl/flphoto_nl	38	share/locale/nl/flphoto_nl
36	share/locale/pt/flphoto_pt	39	share/locale/pt/flphoto_pt
37	@dirrm share/doc/flphoto	40	@dirrm %%DOCSDIR%%