diff --git a/srcpkgs/zip/patches/fix_install.diff b/srcpkgs/zip/patches/fix_install.diff index d9a5727ab7c..4cc0838ed3a 100644 --- a/srcpkgs/zip/patches/fix_install.diff +++ b/srcpkgs/zip/patches/fix_install.diff @@ -1,6 +1,6 @@ ---- unix/Makefile.orig 2009-04-19 00:15:07.062942983 +0200 -+++ unix/Makefile 2009-04-19 00:18:01.606837606 +0200 -@@ -34,10 +34,11 @@ BINFLAGS = 755 +--- unix/Makefile 2009-12-21 14:24:24.000000000 +0300 ++++ unix/Makefile.new 2009-12-21 14:28:30.000000000 +0300 +@@ -38,10 +38,11 @@ MANFLAGS = 644 # target directories - where to install executables and man pages to @@ -8,13 +8,13 @@ +DESTDIR = +prefix = /usr BINDIR = $(prefix)/bin - manext=1 --MANDIR = $(prefix)/man/man$(manext) -+MANDIR = $(prefix)/share/man/man$(manext) - ZIPMANUAL = MANUAL - PKGDIR = IZzip - VERSION = Version 2.32 -@@ -127,12 +128,10 @@ $(ZIPMANUAL): man/zip.1 + MANEXT=1 +-MANDIR = $(prefix)/man/man$(MANEXT) ++MANDIR = $(prefix)/share/man/man$(MANEXT) + ZIPMANUAL = zip.txt + ZIPMANUALcloak = zipcloak.txt + ZIPMANUALnote = zipnote.txt +@@ -157,18 +158,13 @@ # install install: $(ZIPS) @@ -22,12 +22,21 @@ - $(INSTALL_PROGRAM) $(ZIPS) $(BINDIR) - -cd $(BINDIR); $(CHMOD) $(BINFLAGS) $(ZIPS) - -$(INSTALL_D) $(MANDIR) -- $(INSTALL) man/zip.1 $(MANDIR)/zip.$(manext) -- $(CHMOD) $(MANFLAGS) $(MANDIR)/zip.$(manext) -+ install -d $(DESTDIR)$(BINDIR) -+ install -m 755 $(ZIPS) $(DESTDIR)$(BINDIR) -+ install -d $(DESTDIR)$(MANDIR) -+ install -m 644 man/zip.1 $(DESTDIR)$(MANDIR)/zip.$(manext) +- $(INSTALL_PROGRAM) man/zip.1 $(MANDIR)/zip.$(MANEXT) +- $(CHMOD) $(MANFLAGS) $(MANDIR)/zip.$(MANEXT) +- $(INSTALL_PROGRAM) man/zipcloak.1 $(MANDIR)/zipcloak.$(MANEXT) +- $(CHMOD) $(MANFLAGS) $(MANDIR)/zipcloak.$(MANEXT) +- $(INSTALL_PROGRAM) man/zipnote.1 $(MANDIR)/zipnote.$(MANEXT) +- $(CHMOD) $(MANFLAGS) $(MANDIR)/zipnote.$(MANEXT) +- $(INSTALL_PROGRAM) man/zipsplit.1 $(MANDIR)/zipsplit.$(MANEXT) +- $(CHMOD) $(MANFLAGS) $(MANDIR)/zipsplit.$(MANEXT) ++ install -d $(DESTDIR)$(BINDIR) ++ install -m 755 $(ZIPS) $(DESTDIR)$(BINDIR) ++ install -d $(DESTDIR)$(MANDIR) ++ install -m 644 man/zip.1 $(DESTDIR)$(MANDIR)/zip.$(manext)ww ++ install -m 644 man/zipcloak.1 $(DESTDIR)$(MANDIR)/zipcloak.$(manext)ww ++ install -m 644 man/zipnote.1 $(DESTDIR)$(MANDIR)/zipnote.$(manext)ww ++ install -m 644 man/zipsplit.1 $(DESTDIR)$(MANDIR)/zipsplit.$(manext)ww uninstall: -cd $(BINDIR); rm -f $(ZIPS) diff --git a/srcpkgs/zip/template b/srcpkgs/zip/template index 0137ae79319..0b5488259d5 100644 --- a/srcpkgs/zip/template +++ b/srcpkgs/zip/template @@ -1,13 +1,14 @@ # Template build file for 'zip'. pkgname=zip -version=2.32 -distfiles="ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz" +version=3.0 +distfiles="${SOURCEFORGE_SITE}/infozip/zip30.tar.gz" +wrksrc="zip30" build_style=gnu_makefile make_build_target="-f unix/Makefile generic_gcc" make_install_args="-f unix/Makefile" short_desc="Create/update ZIP files compatible with pkzip" maintainer="Juan RP " -checksum=d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f +checksum=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 long_desc=" Zip is a compression and file packaging utility. It is compatible with PKZIP 2.04g (Phil Katz ZIP) for MSDOS systems. There is a companion to zip