From 508466a1759de36f362f44c2c55703e41bc562b8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 19 Nov 2001 09:42:15 +0000 Subject: Kevin Roth's fixes --- packages/Win32/cygwin/Makefile.am | 10 ++--- packages/Win32/cygwin/README | 90 +++++++++++++++++++++++++-------------- 2 files changed, 64 insertions(+), 36 deletions(-) (limited to 'packages/Win32') diff --git a/packages/Win32/cygwin/Makefile.am b/packages/Win32/cygwin/Makefile.am index 816dd4efc..b0e35f729 100644 --- a/packages/Win32/cygwin/Makefile.am +++ b/packages/Win32/cygwin/Makefile.am @@ -15,20 +15,20 @@ EXTRA_DIST = README CYGBUILD = 1 # Cygwin tarball build dir (fully-qualified name, gets deleted when done) -cygwintmp = $(CURDIR)/cygwinbin-builddir +cygwintmp = $(CURDIR)/tmp_binbuild cygwinbin: rm -rf $(cygwintmp) $(MAKE) -C $(top_builddir) install-strip prefix=$(cygwintmp)/usr $(mkinstalldirs) $(cygwintmp)/usr/doc/Cygwin \ $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) - cd $(top_srcdir); \ - cp packages/Win32/cygwin/README \ + cp $(srcdir)/README \ $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README - cd $(top_srcdir) ; \ - cp CHANGES LEGAL MPL-1.1.txt README docs/FAQ docs/FEATURES docs/TODO \ + cd $(top_srcdir) ; cp CHANGES LEGAL MPL-1.1.txt MITX.txt README \ + docs/FAQ docs/FEATURES docs/TODO \ $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) cd $(cygwintmp) ; \ tar cjf $(PACKAGE)-$(VERSION)-$(CYGBUILD).tar.bz2 usr mv $(cygwintmp)/$(PACKAGE)-$(VERSION)-$(CYGBUILD).tar.bz2 . \ && rm -rf $(cygwintmp) + diff --git a/packages/Win32/cygwin/README b/packages/Win32/cygwin/README index 4ef06e1fe..c3fc14659 100644 --- a/packages/Win32/cygwin/README +++ b/packages/Win32/cygwin/README @@ -1,35 +1,37 @@ -Curl is a tool for transferring files with URL syntax, supporting FTP, FTPS, - HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. Curl supports HTTPS - certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP form based - upload, proxies, cookies, user+password authentication, file transfer resume, - http proxy tunneling and a busload of other useful tricks. - See /usr/doc/curl-/FEATURES for more info. +Curl is a tool for transferring files with URL syntax, supporting + FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. + Curl supports HTTPS certificates, HTTP POST, HTTP PUT, + FTP uploading, kerberos, HTTP form based upload, proxies, + cookies, user+password authentication, file transfer resume, + http proxy tunneling and a busload of other useful tricks. -cURL (as of 7.9.1) builds 100% cleanly OOTB. +See /usr/doc/curl-/FEATURES for more info. -The Cygwin specific source files (README and a Makefile for - building binary tarballs) are not in a CYGWIN-PATCHES directory. -They are at: /packages/Win32/cygwin/ +Runtime Dependencies: + - Cygwin + +Compile-time Dependencies: + - OpenSSL 0.9.6b (*) -Direct Dependencies: - OpenSSL 0.9.6b (*) cURL can be built without SSL support: ./configure --without-ssl -Canonical Homepage: +Canonical Homepage and Downloads: http://curl.haxx.se/ + http://curl.haxx.se/download.html -Canonical Download: - http://curl.haxx.se/download.html +Cygwin specific source files (a .README template and a Makefile + for building binary tarballs) are maintained in the upstream + CVS at: /packages/Win32/cygwin/ -Build Instructions: - Download the source, move it to a location of your choosing, and then: +Build Instructions (as distributed via cygwin's setup.exe): + (NOTE: as of curl 7.9.1, compiles/tests 100% cleanly OOTB under cygwin) + + Download the source, unpack it to a location of your choosing, and then: - $ tar xjf curl--X-src.tar.bz2 - $ cd curl--X $ ./configure --prefix=/usr $ make $ make test # optional, requires perl @@ -42,19 +44,45 @@ Build Instructions: Packaging Instructions: - To create a new binary tarball for cygwin's setup.exe, the first step is to - do a clean build (./configure and make). The 'make install' step is optional. - Then do: + ---BINARY--- + Compile cleanly (./configure + make). Then: - $ cd curl--X - $ make cygwinbin CYGBUILD=X + $ make cygwinbin CYGBUILD=n - where "X" is the cygwin release number (e.g. the "-1" in curl-7.9.3-1). - If you leave off "CYGBUILD=X", X defaults to 1. + where n is the cygwin release number (e.g. the "1" in curl-7.9-1). + If you leave off "CYGBUILD=n", n defaults to 1. - Assuming everything worked properly, you'll find your cygwin - binary tarball in the curl--X/packages/Win32/cygwin/ directory. - - -Cygwin port maintained by: + Assuming everything worked properly, you'll find your binary tarball + in the packages/Win32/cygwin/ sub-directory. + + ---SOURCE--- + 1. unpack the pristine source into an otherwise empty directory + 2. rename the source dir to add the "-$(REL)" suffix, e.g.: + $ mv curl-7.9 curl-7.9-1 + 3. add a CYGWIN-PATCHES directory, and add this readme to it + $ cd curl-7.9-$(REL); mkdir CYGWIN-PATCHES + $ cp packages/Win32/cygwin/README CYGWIN-PATCHES/curl-7.9-$(REL).README + 4. if applicable, document any changes in the README file + 5. create a patch which, when applied (patch -p1 < curl-7.9-$(REL).patch) + will remove any patches you've applied: + $ cd .. + $ diff -Nrup (patched-src-dir) (pristine-src-dir) > curl-7.9-$(REL).patch + and then move it into the CYGWIN-PATCHES directory + 6. repack + + ---SETUP.HINT--- + sdesc: "a client that groks URLs" + ldesc: "Curl is a tool for transferring files with URL syntax, + supporting FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE + and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT, + FTP uploading, kerberos, HTTP form based upload, proxies, + cookies, user+password authentication, file transfer resume, + http proxy tunneling and a busload of other useful tricks." + category: Web Libs + requires: cygwin + + +Cygwin port maintained by: Kevin Roth + Questions regarding cURL use should be directed to curl@contactor.se. + Questions regarding its packaging should be directed to cygwin@cygwin.com. -- cgit v1.2.3