Attachment #74103 for bug #107264

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




#

PORTNAME=	autoconvert
PORTVERSION=	0.3.16
CATEGORIES=	chinese
MASTER_SITES=	http://people.debian.org/~ygh/

MAINTAINER=	yinjieh@csie.nctu.edu.tw
COMMENT=	Intelligent Chinese encoding converter

DATADIR=	${TARGETDIR}/share/${PKGNAMEPREFIX}${PORTNAME}
MAKE_ENV=	CFLAG="${CPPFLAGS}" LIBS="${LDFLAGS}"
USE_GETOPT_LONG=	yes
USE_LDCONFIG=	yes


pre-install:
	@${MKDIR} ${DATADIR}
.for i in ChangeLog LICENSE Readme TODO Thanks Version
	@${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}
.endfor


Lines 1-3 Link Here

(-)/root/ports/autoconvert/distinfo (-3 / +3 lines)
1	MD5 (autoconvert-0.3.14.tar.gz) = 3023068ab9cc7aaa25b8b294698c4b39	1	MD5 (autoconvert-0.3.16.tar.gz) = 1f4aa2332afc076910b5d510b8c81966
2	SHA256 (autoconvert-0.3.14.tar.gz) = a246b403f21cf45c97eeccd0f3eb63ced8ec0b4c7c267a0ddafbf7e39214aa53	2	SHA256 (autoconvert-0.3.16.tar.gz) = 9fe3df9864c63854dc3012d8e3f9ba94bc4e611d410ed1897fc94b612925cf76
3	SIZE (autoconvert-0.3.14.tar.gz) = 464192	3	SIZE (autoconvert-0.3.16.tar.gz) = 275360




--- Makefile.orig	Sat Apr 28 09:45:46 2001
+++ Makefile	Thu Dec 28 15:12:13 2006
@@ -1,7 +1,7 @@
 
 CC=gcc
-CFLAG=-O2 -g -Wall -Iinclude
-LIBS= -Llib -lhz
+CFLAG+=-Iinclude
+LIBS+=-Llib -lhz
 
 .PHONY: all hzlib clean install-home install
 
@@ -30,12 +30,11 @@
 	ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
 	chmod 755 $(HOME)/bin/autogb 
 install:
-	install -m 755 autogb $(DESTDIR)/usr/bin
-	install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
-	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0.0 libhz.so.0
-	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0 libhz.so
-	install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
-	install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
-	install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
-	install -m 644 include/*.h  $(DESTDIR)/usr/include
-	ln -s autogb $(DESTDIR)/usr/bin/autob5
+	${BSD_INSTALL_PROGRAM} autogb $(PREFIX)/bin
+	${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(PREFIX)/lib/libhz.so.0
+	cd $(PREFIX)/lib;ln -s  libhz.so.0 libhz.so
+	${BSD_INSTALL_PROGRAM} lib/libhz.a $(PREFIX)/lib
+	#${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autogb.so $(PREFIX)/share/autoconvert
+	#${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autob5.so $(PREFIX)/share/autoconvert
+	${BSD_INSTALL_DATA} include/*.h  $(PREFIX)/include
+	ln -s autogb $(PREFIX)/bin/autob5




--- Makefile.orig	Sat Apr 28 09:45:46 2001
+++ Makefile	Thu May 15 13:52:33 2003
@@ -1,7 +1,7 @@
 
 CC=gcc
-CFLAG=-O2 -g -Wall -Iinclude
-LIBS= -Llib -lhz
+CFLAG+=-Iinclude
+LIBS+=-Llib -lhz
 
 .PHONY: all hzlib clean install-home install
 
@@ -30,12 +30,11 @@
 	ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
 	chmod 755 $(HOME)/bin/autogb 
 install:
-	install -m 755 autogb $(DESTDIR)/usr/bin
-	install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
-	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0.0 libhz.so.0
-	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0 libhz.so
-	install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
-	install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
-	install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
-	install -m 644 include/*.h  $(DESTDIR)/usr/include
-	ln -s autogb $(DESTDIR)/usr/bin/autob5
+	${BSD_INSTALL_PROGRAM} autogb $(PREFIX)/bin
+	${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(PREFIX)/lib/libhz.so.0
+	cd $(PREFIX)/lib;ln -s  libhz.so.0 libhz.so
+	${BSD_INSTALL_PROGRAM} lib/libhz.a $(PREFIX)/lib
+	${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autogb.so $(PREFIX)/share/zh-autoconvert
+	${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autob5.so $(PREFIX)/share/zh-autoconvert
+	${BSD_INSTALL_DATA} include/*.h  $(PREFIX)/include
+	ln -s autogb $(PREFIX)/bin/autob5




--- hzconvert/Makefile.orig	Mon Jan  8 11:03:21 2001
+++ hzconvert/Makefile	Mon Mar 22 09:39:15 2004
@@ -1,18 +1,18 @@
 CC=gcc -I../include
-CFLAGS=-O2 -Wall -g
+CFLAGS+=-fPIC -Wall -g
 SHARED_LIB=libhz.so
 SHARED_LIB_MAJOR=$(SHARED_LIB).0
 SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
 OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o 
 
+all: libhzconvert
+
 %.o: %.c
 	$(CC) -fPIC $(CFLAGS) -c $<
 
-all: libhzconvert
-
 libhzconvert: $(OBJS)
 	ar rs  ../lib/libhz.a $(OBJS)
-	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS) -ldl
+	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS)
 	rm -f ../lib/$(SHARED_LIB_MAJOR)
 	rm -f ../lib/$(SHARED_LIB)
 	cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)




--- hzconvert/Makefile.orig	Mon Jan  8 18:03:21 2001
+++ hzconvert/Makefile	Thu Dec 28 10:30:43 2006
@@ -1,18 +1,18 @@
-CC=gcc -I../include
-CFLAGS=-O2 -Wall -g
+CC=gcc
+CFLAGS+=-fPIC -Wall -g -I../include
 SHARED_LIB=libhz.so
 SHARED_LIB_MAJOR=$(SHARED_LIB).0
 SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
 OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o 
 
+all: libhzconvert
+
 %.o: %.c
 	$(CC) -fPIC $(CFLAGS) -c $<
 
-all: libhzconvert
-
 libhzconvert: $(OBJS)
 	ar rs  ../lib/libhz.a $(OBJS)
-	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS) -ldl
+	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS)
 	rm -f ../lib/$(SHARED_LIB_MAJOR)
 	rm -f ../lib/$(SHARED_LIB)
 	cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)




%%DATADIR%%/TODO
%%DATADIR%%/Thanks
%%DATADIR%%/Version
%%DATADIR%%/hz.txt
%%DATADIR%%/procmailrc.example
%%DATADIR%%/shed.big5
%%DATADIR%%/shed.gb
%%DATADIR%%/shed.uni
%%DATADIR%%/shed.utf7
%%DATADIR%%/shed.utf8
%%DATADIR%%/xchat-autob5.so
%%DATADIR%%/xchat-autogb.so
@dirrm %%DATADIR%%

Return to bug 107264

Lines 6-19 Link Here

(-)/root/ports/autoconvert/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= autoconvert	8	PORTNAME= autoconvert
9	PORTVERSION= 0.3.14	9	PORTVERSION= 0.3.16
10	CATEGORIES= chinese	10	CATEGORIES= chinese
11	MASTER_SITES= ftp://banyan.dlut.edu.cn/pub/PEOPLE/saka/	11	MASTER_SITES= http://people.debian.org/~ygh/
12		12
13	MAINTAINER= yinjieh@csie.nctu.edu.tw	13	MAINTAINER= yinjieh@csie.nctu.edu.tw
14	COMMENT= Intelligent Chinese encoding converter	14	COMMENT= Intelligent Chinese encoding converter
15		15
16	DATADIR= ${TARGETDIR}/share/${PKGNAMEPREFIX}${PORTNAME}
17	MAKE_ENV= CFLAG="${CPPFLAGS}" LIBS="${LDFLAGS}"	16	MAKE_ENV= CFLAG="${CPPFLAGS}" LIBS="${LDFLAGS}"
18	USE_GETOPT_LONG= yes	17	USE_GETOPT_LONG= yes
19	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
Lines 24-30 Link Here
24		23
25	pre-install:	24	pre-install:
26	@${MKDIR} ${DATADIR}	25	@${MKDIR} ${DATADIR}
27	.for i in ChangeLog LICENSE Readme TODO Thanks Version hz.txt procmailrc.example shed.big5 shed.gb shed.uni shed.utf7 shed.utf8	26	.for i in ChangeLog LICENSE Readme TODO Thanks Version
28	@${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}	27	@${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}
29	.endfor	28	.endfor
30		29

Line 0 Link Here

(-)/root/ports/autoconvert/files/patch-Makefile (+33 lines)
	1	--- Makefile.orig Sat Apr 28 09:45:46 2001
	2	+++ Makefile Thu Dec 28 15:12:13 2006
	3	@@ -1,7 +1,7 @@
	4
	5	CC=gcc
	6	-CFLAG=-O2 -g -Wall -Iinclude
	7	-LIBS= -Llib -lhz
	8	+CFLAG+=-Iinclude
	9	+LIBS+=-Llib -lhz
	10
	11	.PHONY: all hzlib clean install-home install
	12
	13	@@ -30,12 +30,11 @@
	14	ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
	15	chmod 755 $(HOME)/bin/autogb
	16	install:
	17	- install -m 755 autogb $(DESTDIR)/usr/bin
	18	- install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
	19	- cd $(DESTDIR)/usr/lib;ln -s libhz.so.0.0 libhz.so.0
	20	- cd $(DESTDIR)/usr/lib;ln -s libhz.so.0 libhz.so
	21	- install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
	22	- install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
	23	- install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
	24	- install -m 644 include/*.h $(DESTDIR)/usr/include
	25	- ln -s autogb $(DESTDIR)/usr/bin/autob5
	26	+ ${BSD_INSTALL_PROGRAM} autogb $(PREFIX)/bin
	27	+ ${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(PREFIX)/lib/libhz.so.0
	28	+ cd $(PREFIX)/lib;ln -s libhz.so.0 libhz.so
	29	+ ${BSD_INSTALL_PROGRAM} lib/libhz.a $(PREFIX)/lib
	30	+ #${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autogb.so $(PREFIX)/share/autoconvert
	31	+ #${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autob5.so $(PREFIX)/share/autoconvert
	32	+ ${BSD_INSTALL_DATA} include/*.h $(PREFIX)/include
	33	+ ln -s autogb $(PREFIX)/bin/autob5

Lines 1-33 Link Here

(-)/root/ports/autoconvert/files/patch-aa (-33 lines)
1	--- Makefile.orig Sat Apr 28 09:45:46 2001
2	+++ Makefile Thu May 15 13:52:33 2003
3	@@ -1,7 +1,7 @@
4
5	CC=gcc
6	-CFLAG=-O2 -g -Wall -Iinclude
7	-LIBS= -Llib -lhz
8	+CFLAG+=-Iinclude
9	+LIBS+=-Llib -lhz
10
11	.PHONY: all hzlib clean install-home install
12
13	@@ -30,12 +30,11 @@
14	ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
15	chmod 755 $(HOME)/bin/autogb
16	install:
17	- install -m 755 autogb $(DESTDIR)/usr/bin
18	- install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
19	- cd $(DESTDIR)/usr/lib;ln -s libhz.so.0.0 libhz.so.0
20	- cd $(DESTDIR)/usr/lib;ln -s libhz.so.0 libhz.so
21	- install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
22	- install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
23	- install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
24	- install -m 644 include/*.h $(DESTDIR)/usr/include
25	- ln -s autogb $(DESTDIR)/usr/bin/autob5
26	+ ${BSD_INSTALL_PROGRAM} autogb $(PREFIX)/bin
27	+ ${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(PREFIX)/lib/libhz.so.0
28	+ cd $(PREFIX)/lib;ln -s libhz.so.0 libhz.so
29	+ ${BSD_INSTALL_PROGRAM} lib/libhz.a $(PREFIX)/lib
30	+ ${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autogb.so $(PREFIX)/share/zh-autoconvert
31	+ ${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autob5.so $(PREFIX)/share/zh-autoconvert
32	+ ${BSD_INSTALL_DATA} include/*.h $(PREFIX)/include
33	+ ln -s autogb $(PREFIX)/bin/autob5

Lines 1-25 Link Here

(-)/root/ports/autoconvert/files/patch-ab (-25 lines)
1	--- hzconvert/Makefile.orig Mon Jan 8 11:03:21 2001
2	+++ hzconvert/Makefile Mon Mar 22 09:39:15 2004
3	@@ -1,18 +1,18 @@
4	CC=gcc -I../include
5	-CFLAGS=-O2 -Wall -g
6	+CFLAGS+=-fPIC -Wall -g
7	SHARED_LIB=libhz.so
8	SHARED_LIB_MAJOR=$(SHARED_LIB).0
9	SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
10	OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o
11
12	+all: libhzconvert
13	+
14	%.o: %.c
15	$(CC) -fPIC $(CFLAGS) -c $<
16
17	-all: libhzconvert
18	-
19	libhzconvert: $(OBJS)
20	ar rs ../lib/libhz.a $(OBJS)
21	- gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR) $(OBJS) -ldl
22	+ gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR) $(OBJS)
23	rm -f ../lib/$(SHARED_LIB_MAJOR)
24	rm -f ../lib/$(SHARED_LIB)
25	cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)

Line 0 Link Here

(-)/root/ports/autoconvert/files/patch-hzconvert::Makefile (+26 lines)
	1	--- hzconvert/Makefile.orig Mon Jan 8 18:03:21 2001
	2	+++ hzconvert/Makefile Thu Dec 28 10:30:43 2006
	3	@@ -1,18 +1,18 @@
	4	-CC=gcc -I../include
	5	-CFLAGS=-O2 -Wall -g
	6	+CC=gcc
	7	+CFLAGS+=-fPIC -Wall -g -I../include
	8	SHARED_LIB=libhz.so
	9	SHARED_LIB_MAJOR=$(SHARED_LIB).0
	10	SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
	11	OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o
	12
	13	+all: libhzconvert
	14	+
	15	%.o: %.c
	16	$(CC) -fPIC $(CFLAGS) -c $<
	17
	18	-all: libhzconvert
	19	-
	20	libhzconvert: $(OBJS)
	21	ar rs ../lib/libhz.a $(OBJS)
	22	- gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR) $(OBJS) -ldl
	23	+ gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR) $(OBJS)
	24	rm -f ../lib/$(SHARED_LIB_MAJOR)
	25	rm -f ../lib/$(SHARED_LIB)
	26	cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)

Lines 11-23 Link Here

(-)/root/ports/autoconvert/pkg-plist (-9 lines)
11	%%DATADIR%%/TODO	11	%%DATADIR%%/TODO
12	%%DATADIR%%/Thanks	12	%%DATADIR%%/Thanks
13	%%DATADIR%%/Version	13	%%DATADIR%%/Version
14	%%DATADIR%%/hz.txt
15	%%DATADIR%%/procmailrc.example
16	%%DATADIR%%/shed.big5
17	%%DATADIR%%/shed.gb
18	%%DATADIR%%/shed.uni
19	%%DATADIR%%/shed.utf7
20	%%DATADIR%%/shed.utf8
21	%%DATADIR%%/xchat-autob5.so
22	%%DATADIR%%/xchat-autogb.so
23	@dirrm %%DATADIR%%	14	@dirrm %%DATADIR%%