From 85df4a1fdc701e44257bc25197f7bd05624475a7 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 23 Sep 2002 02:02:46 +0000 Subject: This package doesn't want pthreads...it wants GNU pth. --- inputmethod/unicon-im/Makefile | 6 ++---- inputmethod/unicon-im/buildlink2.mk | 4 +++- inputmethod/unicon-im/distinfo | 4 ++-- inputmethod/unicon-im/patches/patch-ab | 31 ++++++++++++++++++------------- 4 files changed, 25 insertions(+), 20 deletions(-) (limited to 'inputmethod/unicon-im') diff --git a/inputmethod/unicon-im/Makefile b/inputmethod/unicon-im/Makefile index d9c29b5a04a..c1e8d3cc513 100644 --- a/inputmethod/unicon-im/Makefile +++ b/inputmethod/unicon-im/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/23 01:36:58 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/23 02:02:46 jlam Exp $ DISTNAME= unicon-1.2 PKGNAME= unicon-im-1.2 @@ -12,9 +12,7 @@ COMMENT= libraries and modules of Unicon USE_BUILDLINK2= YES USE_X11= YES USE_LIBTOOL= YES -PTHREAD_OPTS+= require - GNU_CONFIGURE= YES -.include "../../mk/pthread.buildlink2.mk" +.include "../../devel/pth/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/unicon-im/buildlink2.mk b/inputmethod/unicon-im/buildlink2.mk index 617a880bc86..cd1d6b5d18a 100644 --- a/inputmethod/unicon-im/buildlink2.mk +++ b/inputmethod/unicon-im/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/09/23 01:42:08 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2002/09/23 02:02:46 jlam Exp $ .if !defined(UNICON_IM_BUILDLINK2_MK) UNICON_IM_BUILDLINK2_MK= # defined @@ -15,6 +15,8 @@ BUILDLINK_FILES.unicon-im+= lib/unicon/TL_hzinput.* BUILDLINK_FILES.unicon-im+= lib/unicon/cce_hzinput.* BUILDLINK_FILES.unicon-im+= lib/unicon/cce_pinyin.* +.include "../../devel/pth/buildlink2.mk" + BUILDLINK_TARGETS+= unicon-im-buildlink unicon-im-buildlink: _BUILDLINK_USE diff --git a/inputmethod/unicon-im/distinfo b/inputmethod/unicon-im/distinfo index 2b3b1148684..392c155c54b 100644 --- a/inputmethod/unicon-im/distinfo +++ b/inputmethod/unicon-im/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/06/15 09:29:14 shell Exp $ +$NetBSD: distinfo,v 1.2 2002/09/23 02:02:47 jlam Exp $ SHA1 (unicon-1.2.tar.gz) = 61854d160547f645f8033f0b4fd15ebb15ab92a8 Size (unicon-1.2.tar.gz) = 7815217 bytes SHA1 (patch-aa) = b9103d7fb810a6151144ccff9ff537fe8e505d51 -SHA1 (patch-ab) = 6d88b2c988fd793d56fa26e951a36284cb68655f +SHA1 (patch-ab) = c11821af687af5e07a8dffa06e69324622228b05 SHA1 (patch-ac) = 1d39276efc5f20d7394fe08d6c9eb75308829d9b SHA1 (patch-ad) = 01de02c2ae547adee291dd119b86fb3097c02db5 SHA1 (patch-ae) = c26e800c754a45fbd7085f4ff1659d2ed9053cc4 diff --git a/inputmethod/unicon-im/patches/patch-ab b/inputmethod/unicon-im/patches/patch-ab index 71c709e7221..f57aa3b448f 100644 --- a/inputmethod/unicon-im/patches/patch-ab +++ b/inputmethod/unicon-im/patches/patch-ab @@ -1,31 +1,36 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/06/15 09:29:15 shell Exp $ +$NetBSD: patch-ab,v 1.2 2002/09/23 02:02:47 jlam Exp $ ---- server/Makefile.in.orig Mon May 22 18:32:04 2000 +--- server/Makefile.in.orig Mon May 22 03:32:04 2000 +++ server/Makefile.in -@@ -1,7 +1,7 @@ +@@ -1,7 +1,8 @@ prefix=@prefix@ -CFLAGS = @CFLAGS@ +CFLAGS = -Wall -I. -I../include @CFLAGS@ ++LDFLAGS = @LDFLAGS@ APP_PROG = imm_server -DLIB_PROG = libimm_server.so -+DLIB_PROG = libimm_server.a ++DLIB_PROG = libimm_server.la APP_OBJS = TLS_HzInput.o TLS_ImmOp.o TLS_TcpipMain.o TLS_MemFile.o \ TLS_PthSocket.o TLS_Debug.o \ -@@ -14,16 +14,16 @@ - LIBS = /usr/local/lib/libpth.so -ldl +@@ -11,19 +12,18 @@ DLIB_OBJS = TLS_HzInput.o TLS_ImmOp.o TL + TLS_Debug.o TLS_LibMain.o TLS_DoubleByteConvertor.o \ + TLS_AsciiConvertor.o + +-LIBS = /usr/local/lib/libpth.so -ldl ++LIBS = -lpth # CFLAGS = -g -D__IMM_DEBUG__ -Wall -I. -I/usr/local/include -I../include -CFLAGS = -g -Wall -I. -I/usr/local/include -I../include -CC=g++ +CC = $(LIBTOOL) --mode=compile $(CXX) --all: $(DLIB_PROG) -+all: $(DLIB_OBJS) -+ $(LIBTOOL) --mode=link $(CXX) -o $(DLIB_PROG:.a=.la) $(DLIB_OBJS:.o=.lo) -rpath $(prefix)/lib -version-info 1:2 + all: $(DLIB_PROG) - libimm_server.so: $(DLIB_OBJS) - $(CC) $(DLIB_OBJS) -shared -o $(DLIB_PROG) +-libimm_server.so: $(DLIB_OBJS) +- $(CC) $(DLIB_OBJS) -shared -o $(DLIB_PROG) ++libimm_server.la: $(DLIB_OBJS) ++ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(DLIB_PROG) $(DLIB_OBJS:.o=.lo) -rpath $(prefix)/lib -version-info 1:2 $(LIBS) TLS_LibMain.o : TLS_LibMain.cpp - $(CC) $(CFLAGS) -DUNICON2_LIB=\"$(prefix)/lib/unicon2\" -c TLS_LibMain.cpp -o TLS_LibMain.o @@ -33,7 +38,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/06/15 09:29:15 shell Exp $ app: $(APP_OBJS) $(CC) $(APP_OBJS) $(LIBS) -o $(APP_PROG) -@@ -44,11 +44,8 @@ +@@ -44,11 +44,8 @@ TLS_DoubleByteConvertor.o : TLS_DoubleBy TLS_AsciiConvertor.o : TLS_AsciiConvertor.cpp $(CC) $(CFLAGS) -c TLS_AsciiConvertor.cpp -o TLS_AsciiConvertor.o @@ -43,7 +48,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/06/15 09:29:15 shell Exp $ - if [ -f $(APP_PROG) ]; then cp -f $(APP_PROG) $(prefix)/bin; fi - if [ -f $(DLIB_PROG) ]; then cp -f $(DLIB_PROG) $(prefix)/lib/unicon2; fi +install: -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(DLIB_PROG:.a=.la) $(prefix)/lib ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(DLIB_PROG) $(prefix)/lib clean: if test -e $(PROG); then rm -f $(PROG); fi -- cgit v1.2.3