Attachment #82300 for bug #117728

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




#

PORTNAME=	diction
PORTVERSION=	1.11
CATEGORIES=	misc
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	${PORTNAME}

COMMENT=	GNU diction and style

GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

PLIST_FILES=	bin/diction bin/style share/diction/C share/diction/de \
		share/diction/en share/diction/en_GB share/diction/nl
PLIST_DIRS=	share/diction

MAN1=		diction.1 style.1

post-patch:
	${REINPLACE_CMD} -e "s,-pedantic,," ${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/usr/ports/misc/diction.new/distinfo (-3 / +3 lines)
1	MD5 (diction-1.02.tar.gz) = e50fd9139d47b1f146b1342293825f19	1	MD5 (diction-1.11.tar.gz) = 4cbdb115c976d7141f54b223df28012e
2	SHA256 (diction-1.02.tar.gz) = 8dadbd41e7e2f6b046897c09bb610db00b06f363eaf3e1f94afb3d8cb2c6ab51	2	SHA256 (diction-1.11.tar.gz) = 35c2f1bf8ddf0d5fa9f737ffc8e55230736e5d850ff40b57fdf5ef1d7aa024f6
3	SIZE (diction-1.02.tar.gz) = 90957	3	SIZE (diction-1.11.tar.gz) = 141062




--- Makefile.in.orig	Tue May 16 03:10:04 2000
+++ Makefile.in	Tue Dec 19 00:32:28 2000
@@ -3,6 +3,10 @@
 prefix=		@prefix@
 exec_prefix=	@exec_prefix@
 
+INSTALL=	@INSTALL@
+INSTALL_PROGRAM=	@INSTALL_PROGRAM@
+INSTALL_DATA=	@INSTALL_DATA@
+
 CC=		@CC@
 CFLAGS=		@CFLAGS@
 CPPFLAGS=	@CPPFLAGS@ -DSHAREDIR=\"@datadir@\"
@@ -20,16 +24,16 @@
 		getopt.o getopt1.o $(LIBM) $(LIBS)
 
 install:	all
-		@INSTALL@ -m 755 -d @bindir@
-		@INSTALL@ diction @bindir@/diction
-		@INSTALL@ style @bindir@/style
-		@INSTALL@ -m 755 -d @datadir@/diction
-		@INSTALL@ -m 644 de @datadir@/diction/de
-		@INSTALL@ -m 644 en @datadir@/diction/en
+		-mkdir -p @bindir@
+		$(INSTALL_PROGRAM) diction @bindir@/diction
+		$(INSTALL_PROGRAM) style @bindir@/style
+		-mkdir -p @datadir@/diction
+		$(INSTALL_DATA) de @datadir@/diction/de
+		$(INSTALL_DATA) en @datadir@/diction/en
 		(cd @datadir@/diction; rm -f C; ln en C)
-		@INSTALL@ -m 755 -d @mandir@/man1
-		@INSTALL@ -m 644 diction.1 @mandir@/man1/diction.1
-		@INSTALL@ -m 644 style.1 @mandir@/man1/style.1
+		-mkdir -p @mandir@/man1
+		$(INSTALL_DATA) diction.1 @mandir@/man1/diction.1
+		$(INSTALL_DATA) style.1 @mandir@/man1/style.1
 
 install.msg:
 		gencat -o @datadir@/locale/en_US/LC_MESSAGES/diction.cat diction-en.msg sent-en.msg

Return to bug 117728

Lines 6-12 Link Here

(-)/usr/ports/misc/diction.new/Makefile (-5 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= diction	8	PORTNAME= diction
9	PORTVERSION= 1.02	9	PORTVERSION= 1.11
10	CATEGORIES= misc	10	CATEGORIES= misc
11	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= ${MASTER_SITE_GNU}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-28 Link Here
15	COMMENT= GNU diction and style	15	COMMENT= GNU diction and style
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
		18	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
18		19
19	PLIST_FILES= bin/diction bin/style share/diction/C share/diction/de \	20	PLIST_FILES= bin/diction bin/style share/diction/C share/diction/de \
20	share/diction/en	21	share/diction/en share/diction/en_GB share/diction/nl
21	PLIST_DIRS= share/diction	22	PLIST_DIRS= share/diction
22		23
23	MAN1= diction.1 style.1	24	MAN1= diction.1 style.1
24		25
25	post-patch:
26	${REINPLACE_CMD} -e "s,-pedantic,," ${WRKSRC}/configure
27
28	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Lines 1-39 Link Here

(-)/usr/ports/misc/diction.new/files/patch-aa (-39 lines)
1	--- Makefile.in.orig Tue May 16 03:10:04 2000
2	+++ Makefile.in Tue Dec 19 00:32:28 2000
3	@@ -3,6 +3,10 @@
4	prefix= @prefix@
5	exec_prefix= @exec_prefix@
6
7	+INSTALL= @INSTALL@
8	+INSTALL_PROGRAM= @INSTALL_PROGRAM@
9	+INSTALL_DATA= @INSTALL_DATA@
10	+
11	CC= @CC@
12	CFLAGS= @CFLAGS@
13	CPPFLAGS= @CPPFLAGS@ -DSHAREDIR=\"@datadir@\"
14	@@ -20,16 +24,16 @@
15	getopt.o getopt1.o $(LIBM) $(LIBS)
16
17	install: all
18	- @INSTALL@ -m 755 -d @bindir@
19	- @INSTALL@ diction @bindir@/diction
20	- @INSTALL@ style @bindir@/style
21	- @INSTALL@ -m 755 -d @datadir@/diction
22	- @INSTALL@ -m 644 de @datadir@/diction/de
23	- @INSTALL@ -m 644 en @datadir@/diction/en
24	+ -mkdir -p @bindir@
25	+ $(INSTALL_PROGRAM) diction @bindir@/diction
26	+ $(INSTALL_PROGRAM) style @bindir@/style
27	+ -mkdir -p @datadir@/diction
28	+ $(INSTALL_DATA) de @datadir@/diction/de
29	+ $(INSTALL_DATA) en @datadir@/diction/en
30	(cd @datadir@/diction; rm -f C; ln en C)
31	- @INSTALL@ -m 755 -d @mandir@/man1
32	- @INSTALL@ -m 644 diction.1 @mandir@/man1/diction.1
33	- @INSTALL@ -m 644 style.1 @mandir@/man1/style.1
34	+ -mkdir -p @mandir@/man1
35	+ $(INSTALL_DATA) diction.1 @mandir@/man1/diction.1
36	+ $(INSTALL_DATA) style.1 @mandir@/man1/style.1
37
38	install.msg:
39	gencat -o @datadir@/locale/en_US/LC_MESSAGES/diction.cat diction-en.msg sent-en.msg