From bc1a8c4a7c0c5884c4a53057d3c19d5183b09462 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 6 Jul 2002 02:24:58 +0000
Subject: Actually `cvs add' needed patch for 3.1.4 this time. Also optimize
the Makefile a little more.
Submitted by: naddy
---
ftp/ncftp3/Makefile | 8 ++++----
ftp/ncftp3/files/patch-sio-Makefile.in | 26 ++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 ftp/ncftp3/files/patch-sio-Makefile.in
(limited to 'ftp/ncftp3')
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 60824a6b90ec..ee75bf3c4e2c 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -43,12 +43,12 @@ do-install:
@cd ${WRKSRC}/bin ; ${INSTALL_PROGRAM} \
ncftpbatch ncftpget ncftpls ncftpput ncftpbookmarks \
${PREFIX}/bin
- @cd ${PREFIX}/bin && ${LN} ncftpbatch ncftpspooler
- @${INSTALL_DATA} ${WRKSRC}/Strn/libStrn.so.1 ${PREFIX}/lib/${LIBSTRN}
- @cd ${PREFIX}/lib && ${LN} -sf ${LIBSTRN} libStrn.so
- @cd ${WRKSRC} && ${INSTALL_DATA} libncftp/${LIBNCFTP} sio/${LIBSIO} \
+ @cd ${PREFIX}/bin && ${LN} -f ncftpbatch ncftpspooler
+ @cd ${WRKSRC} && ${INSTALL_DATA} \
+ Strn/${LIBSTRN} libncftp/${LIBNCFTP} sio/${LIBSIO} \
${PREFIX}/lib
@cd ${PREFIX}/lib \
+ && ${LN} -sf ${LIBSTRN} libStrn.so \
&& ${LN} -sf ${LIBNCFTP} libncftp.so \
&& ${LN} -sf ${LIBSIO} libsio.so
@${INSTALL_MAN} ${WRKSRC}/doc/man/ncftp.1 ${PREFIX}/man/man1/ncftp3.1
diff --git a/ftp/ncftp3/files/patch-sio-Makefile.in b/ftp/ncftp3/files/patch-sio-Makefile.in
new file mode 100644
index 000000000000..1485fd3efdff
--- /dev/null
+++ b/ftp/ncftp3/files/patch-sio-Makefile.in
@@ -0,0 +1,26 @@
+--- sio/Makefile.in.orig Fri Jun 28 03:09:26 2002
++++ sio/Makefile.in Fri Jul 5 11:26:55 2002
+@@ -64,15 +64,19 @@
+ chmod a+r $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
+ -@/bin/ls -l $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
+
++dynamic: $(LIBSO)
++
+ shared: $(LIBSO)
+
+ so: $(LIBSO)
+
+ $(LIBSO): $(SOBJS)
+- /bin/rm -f $(LIBSO)
+- gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS)
+- chmod a+r $(LIB) sio.h usio.h
+- -@/bin/ls -l $(LIBSO)
++ /bin/rm -f $(LIBSO) $(LIBSOS)
++ $(CC) -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS)
++ $(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q`
++ chmod a+r $(LIBSO) sio.h usio.h
++ /bin/ln -s "$(LIBSO)" "$(LIBSOS)"
++ -@/bin/ls -l "$(LIBSOS)" "$(LIBSO)"
+
+ soinstall: $(LIBSO)
+ cp $(LIBSO) $(PREFIX)/lib/$(LIBSO)
--
cgit v1.2.3