From owner-freebsd-ports Mon Feb 28 9:10: 4 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 9922337B8C9 for ; Mon, 28 Feb 2000 09:10:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id JAA30316; Mon, 28 Feb 2000 09:10:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Date: Mon, 28 Feb 2000 09:10:02 -0800 (PST) Message-Id: <200002281710.JAA30316@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Steve Price Subject: Re: ports/16972: japanese/esecanna-vje30: restructuring plus (fwd) Reply-To: Steve Price Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/16972; it has been noted by GNATS. From: Steve Price To: freebsd-gnats-submit@freebsd.org Cc: Subject: Re: ports/16972: japanese/esecanna-vje30: restructuring plus (fwd) Date: Mon, 28 Feb 2000 11:03:40 -0600 (CST) ---------- Forwarded message ---------- Date: Tue, 29 Feb 2000 01:58:27 +0900 From: Akinori -Aki- MUSHA To: freebsd-ports@FreeBSD.ORG Subject: Re: ports/16972: japanese/esecanna-vje30: restructuring plus Modified patch-ab to support 2.2-STABLE. -- / /__ __ / ) ) ) ) / Akinori -Aki- MUSHA aka / (_ / ( (__( "If you choose not to decide you still have made a choice." --- patches/patch-ab.orig Sat Feb 26 00:03:11 2000 +++ patches/patch-ab Tue Feb 29 01:42:15 2000 @@ -1,6 +1,6 @@ --- Makefile.orig Fri Feb 25 14:51:30 2000 -+++ Makefile Sat Feb 26 00:02:26 2000 -@@ -4,7 +4,7 @@ ++++ Makefile Tue Feb 29 01:30:41 2000 +@@ -4,11 +4,19 @@ LIBDIR= $(PREFIX)/lib DLLDIR= $(PREFIX)/lib/esecanna VARDIR= /var @@ -9,7 +9,20 @@ SHLIB_VER?= 1 -@@ -18,7 +18,7 @@ +-TARGETLIB= libesecanna.so ++TARGETLIB_BASE= libesecanna.so ++TARGETLIB_FULL= $(TARGETLIB_BASE).$(SHLIB_VER) ++ ++.if $(PORTOBJFORMAT) == "elf" ++TARGETLIB= $(TARGETLIB_BASE) ++.else ++TARGETLIB= $(TARGETLIB_FULL) ++.endif ++ + TARGET= $(TARGETLIB) esecannaserver + OBJS= main.o cannaproto.o cannasocket.o imewrapper.o + LIBOBJS= misc.o +@@ -18,7 +26,7 @@ -DVARPATH=\"$(VARDIR)\" \ -DRCPATH=\"$(RCDIR)\" CC?= gcc @@ -18,12 +31,13 @@ LDFLAGS= -L. -lesecanna # -L/usr/local/lib -lefence # for Electric Fence LINK= env LD_LIBRARY_PATH=`pwd` $(CC) -@@ -26,10 +26,14 @@ +@@ -26,19 +34,23 @@ all: $(TARGET) $(TARGETLIB): $(LIBOBJS) +- $(CC) -o $@ -shared -Wl,-soname,$@.$(SHLIB_VER) $(LIBOBJS) +.if $(PORTOBJFORMAT) == "elf" - $(CC) -o $@ -shared -Wl,-soname,$@.$(SHLIB_VER) $(LIBOBJS) ++ $(CC) -o $@ -shared -Wl,-soname,$(TARGETLIB_FULL) $(LIBOBJS) +.else + $(CC) -o $@ -shared $(LIBOBJS) +.endif @@ -34,3 +48,14 @@ clean: -rm -f $(OBJS) $(LIBOBJS) $(TARGET) *~ core *.core + + install: $(TARGET) + install -cs esecannaserver $(BINDIR) +- install -cs $(TARGETLIB) $(LIBDIR)/$(TARGETLIB).$(SHLIB_VER) ++ install -cs $(TARGETLIB) $(LIBDIR)/$(TARGETLIB_FULL) + install -cm 644 esecannarc $(RCDIR) +- ln -sf $(LIBDIR)/$(TARGETLIB).$(SHLIB_VER) $(LIBDIR)/$(TARGETLIB) ++ ln -sf $(LIBDIR)/$(TARGETLIB_FULL) $(LIBDIR)/$(TARGETLIB_BASE) + + depend: + @makedepend -Y -- $(CFLAGS) -- $(SRCS) &> /dev/null To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message