diff -urN curl-7.9.1-pre5-orig/Makefile.am curl-7.9.1-pre5/Makefile.am --- curl-7.9.1-pre5-orig/Makefile.am Mon Oct 22 02:26:30 2001 +++ curl-7.9.1-pre5/Makefile.am Sat Oct 27 15:09:10 2001 @@ -68,35 +68,8 @@ cat LEGAL MITX.txt MPL-1.1.txt > $(srcdir)/packages/Solaris/copyright ; \ cd $(srcdir)/packages/Solaris && $(MAKE) package - - - # -# Build a Cygwin binary tarball -# run 'make cygwinbin' once you've done './configure' and 'make' -# deposits curl-${VERSION}.tar.gz into the packages/Cygwin directory -# installation of this tarball is via cygwin-setup.exe -# - -# tmp dir to build binary-tarball in -CygwinTmp = /tmp/curl-binary-build - -# Cygwin build number (for a new curl rev, start at 1) -CygwinBld = 1 - +# Build a cygwin binary tarball installation file +# resulting .tar.bz2 file will end up at packages/Win32/cygwin cygwinbin: - rm -rf $(CygwinTmp) ; \ - $(MAKE) install prefix="$(CygwinTmp)/usr" - $(mkinstalldirs) $(CygwinTmp)/usr/doc/Cygwin \ - $(CygwinTmp)/usr/doc/$(PACKAGE)-$(VERSION) - cp $(top_srcdir)/packages/Cygwin/README \ - $(CygwinTmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CygwinBld).README - cd $(top_srcdir) ; \ - cp CHANGES LEGAL MPL-1.1.txt README docs/FAQ docs/FEATURES \ - docs/TODO $(CygwinTmp)/usr/doc/$(PACKAGE)-$(VERSION) - cd $(CygwinTmp) && \ - tar cjf $(PACKAGE)-$(VERSION)-$(CygwinBld).tar.bz2 usr - mv $(CygwinTmp)/*.tar.bz2 . && rm -rf $(CygwinTmp) - - - + $(MAKE) -C packages/Win32/cygwin cygwinbin diff -urN curl-7.9.1-pre5-orig/configure.in curl-7.9.1-pre5/configure.in --- curl-7.9.1-pre5-orig/configure.in Tue Oct 23 06:13:19 2001 +++ curl-7.9.1-pre5/configure.in Sat Oct 27 11:35:38 2001 @@ -596,7 +596,7 @@ tests/data/Makefile \ packages/Makefile \ packages/Win32/Makefile \ - packages/Cygwin/Makefile \ + packages/Win32/cygwin/Makefile \ packages/Linux/Makefile \ packages/Linux/RPM/Makefile \ packages/Linux/RPM/curl.spec \ diff -urN curl-7.9.1-pre5-orig/packages/Cygwin/Makefile.am curl-7.9.1-pre5/packages/Cygwin/Makefile.am --- curl-7.9.1-pre5-orig/packages/Cygwin/Makefile.am Mon Oct 22 02:08:53 2001 +++ curl-7.9.1-pre5/packages/Cygwin/Makefile.am Wed Dec 31 19:00:00 1969 @@ -1,2 +0,0 @@ -EXTRA_DIST = README - diff -urN curl-7.9.1-pre5-orig/packages/Cygwin/README curl-7.9.1-pre5/packages/Cygwin/README --- curl-7.9.1-pre5-orig/packages/Cygwin/README Mon Oct 22 02:08:53 2001 +++ curl-7.9.1-pre5/packages/Cygwin/README Wed Dec 31 19:00:00 1969 @@ -1,34 +0,0 @@ -cURL (as of 7.9.1) builds completely OOTB. The Cygwin specific files -(README is the only one so far) are located in a non-standard location: - /packages/Cygwin/ - -This release (v7.9) includes the patch needed in CYGWIN-PATCHES, -however future releases should eliminate this directory. - - -Direct Dependencies: - OpenSSL 0.9.6b - -Canonical Homepage: - http://curl.haxx.se/ - -Canonical Download: - http://curl.haxx.se/download.html - - -Build Instructions: - - unpack curl--X-src.tar.bz2 - cd curl- - ./configure --prefix=/usr - make - (optionally) make test (*) - make install (**) - - (*) until v7.9.1, 'make test' requires Cygwin's mounts set to binmode / Unix - (**) if you need to bootstrap, make install will require libtool 1.4.3 - (which contains a patch related to the ".exe" extension on curl.exe - - -Cygwin "port" maintained by: Kevin Roth - diff -urN curl-7.9.1-pre5-orig/packages/Makefile.am curl-7.9.1-pre5/packages/Makefile.am --- curl-7.9.1-pre5-orig/packages/Makefile.am Mon Oct 22 02:08:53 2001 +++ curl-7.9.1-pre5/packages/Makefile.am Sat Oct 27 11:38:35 2001 @@ -1,3 +1,3 @@ -SUBDIRS = Win32 Linux Solaris Cygwin +SUBDIRS = Win32 Linux Solaris EXTRA_DIST = README diff -urN curl-7.9.1-pre5-orig/packages/Win32/Makefile.am curl-7.9.1-pre5/packages/Win32/Makefile.am --- curl-7.9.1-pre5-orig/packages/Win32/Makefile.am Mon Jan 8 11:10:10 2001 +++ curl-7.9.1-pre5/packages/Win32/Makefile.am Sat Oct 27 11:38:47 2001 @@ -1 +1,3 @@ +SUBDIRS = cygwin + EXTRA_DIST = README diff -urN curl-7.9.1-pre5-orig/packages/Win32/cygwin/Makefile.am curl-7.9.1-pre5/packages/Win32/cygwin/Makefile.am --- curl-7.9.1-pre5-orig/packages/Win32/cygwin/Makefile.am Wed Dec 31 19:00:00 1969 +++ curl-7.9.1-pre5/packages/Win32/cygwin/Makefile.am Sat Oct 27 15:18:57 2001 @@ -0,0 +1,37 @@ +EXTRA_DIST = README + +# +# Build a Cygwin binary tar ball +# +# Read the README file for details on using this Makefile +# +# NOTE: As I'm not particularly familiar with Makefiles, this was the +# best I could come up with. It should probably be enhanced someday +# to actually use the correct target and pre-requisite names, etc... +# If anyone else wants to volunteer, feel free ;-) +# + +# Cygwin build number (default to "1") +# NOTE: I tried using this to default CYGBUILD to 1, but couldn't make it work) +#ifndef CYGBUILD +# CYGBUILD = 1 +#endif + +# temp dir for use while building the tarball (fully-qualified) +cygwintmp := $(CURDIR)/cygwinbin-builddir + +cygwinbin: + rm -rf $(cygwintmp) + @(echo Installing to the temporary build dir...) + $(MAKE) -C $(top_builddir) install prefix=$(cygwintmp)/usr + $(mkinstalldirs) $(cygwintmp)/usr/doc/Cygwin \ + $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) + cp $(top_srcdir)/packages/Win32/cygwin/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 \ + $(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 -urN curl-7.9.1-pre5-orig/packages/Win32/cygwin/README curl-7.9.1-pre5/packages/Win32/cygwin/README --- curl-7.9.1-pre5-orig/packages/Win32/cygwin/README Wed Dec 31 19:00:00 1969 +++ curl-7.9.1-pre5/packages/Win32/cygwin/README Sat Oct 27 15:19:10 2001 @@ -0,0 +1,59 @@ +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 (as of 7.9.1) builds 100% cleanly OOTB. + +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/ + + +Direct Dependencies: + OpenSSL 0.9.6b (cURL can be built without SSL support: configure --without-ssl) + + +Canonical Homepage: + http://curl.haxx.se/ + + +Canonical Download: + http://curl.haxx.se/download.html + + +Build Instructions: + Download the source, move 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 + $ make install # (*) + + (*) LibTool 1.4.2 had a bug related to cygwin's use of ".exe" extensions, + such that "make install" blew up at curl.exe. See this URL for details: + http://mail.gnu.org/pipermail/libtool/2001-September/005549.html + The copy of ltmain.sh that is distributed with cURL includes this patch. + + +Packaging Instructions: + To create a new binary tarball for cygwin's setup.exe, you must first do a clean + build (see above). The 'make install' step is optional of course. Then do: + + $ cd curl--X + $ CYGBUILD=X make cygwinbin + + where "X" is the cygwin release number (e.g. the "-1" in curl-7.9.3-1). + I had some difficulty figuring out how to default CYGBUILD to "1", this may + get fixed in a future release. + + Assuming everything worked properly, you'll find your cygwin + binary tarball in the curl--X/packages/Win32/cygwin/ directory. + + +Cygwin port maintained by: + Kevin Roth