Date: Tue, 29 Feb 2000 01:58:27 +0900 From: "Akinori -Aki- MUSHA" <knu@idaemons.org> To: freebsd-ports@FreeBSD.ORG Subject: Re: ports/16972: japanese/esecanna-vje30: restructuring plus Message-ID: <867lfpb6x8.wl@archon.local.idaemons.org> In-Reply-To: In your message of "Sun, 27 Feb 2000 22:58:03 %2B0900" <867lfqeoic.wl@archon.local.idaemons.org> References: <200002260640.WAA68641@freefall.freebsd.org> <861z60mcd6.wl@archon.local.idaemons.org> <867lfqeoic.wl@archon.local.idaemons.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Modified patch-ab to support 2.2-STABLE.
--
/
/__ __
/ ) ) ) ) /
Akinori -Aki- MUSHA aka / (_ / ( (__( <knu@idaemons.org>
"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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?867lfpb6x8.wl>