Major infrastructure changes, part 2.

* Moved helpers, common and triggers dirs into xbps-src, where
  they belong.
* Renamed the templates dir to srcpkgs, it was so redundant before.
* Make it possible to add subpkgs with no restriction in names, for
  example udev now has a subpkgs called "libgudev". Previously
  subpkgs were named "${sourcepkg}-${pkgname}".
* xbps-src: changed to look for template files in current directory.
  That means that most arguments from the targets have been removed.
* xbps-src: added a reinstall target, to remove + install.
* xbps-src: do not overwrite binpkgs by default, skip them.

And more that I forgot because it's a mega-commit that I've been
working for some days already...

--HG--
extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
This commit is contained in:
Juan RP
2009-11-22 08:31:44 +01:00
parent 3c58e3ad40
commit 85cc462e1d
1305 changed files with 719 additions and 654 deletions

View File

@@ -0,0 +1,15 @@
--- unix/Makefile.orig 2009-03-21 01:54:48.460031655 +0100
+++ unix/Makefile 2009-03-21 01:55:23.230935902 +0100
@@ -102,9 +102,9 @@ INSTALL_PROGRAM = $(INSTALL)
INSTALL_D = mkdir -p
# on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
manext = 1
-prefix = /usr/local
-BINDIR = $(prefix)/bin# where to install executables
-MANDIR = $(prefix)/man/man$(manext)# where to install man pages
+DESTDIR = /usr/local
+BINDIR = $(DESTDIR)/usr/bin# where to install executables
+MANDIR = $(DESTDIR)/usr/share/man/man$(manext)# where to install man pages
INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
$(BINDIR)/zipgrep$E $(BINDIR)/zipinfo$E
INSTALLEDMAN = $(MANDIR)/funzip.$(manext) $(MANDIR)/unzip.$(manext) \

View File

@@ -0,0 +1,27 @@
$NetBSD: patch-ad,v 1.1 2006/11/03 07:53:55 rillig Exp $
unzipsfx does not need libz, so a special compile rule is needed for it.
--- unix/Makefile.orig Mon Oct 30 22:45:35 2006
+++ unix/Makefile Mon Oct 30 22:48:02 2006
@@ -87,7 +87,7 @@
OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $M$O
LOBJS = $(OBJS)
OBJSDLL = $(OBJS:.o=.pic.o) api.pic.o
-OBJX = unzipsfx$O $(CRC32)$O crctab_$O crypt_$O extract_$O fileio_$O \
+OBJX = unzipsfx$O crc32_$O crctab_$O crypt_$O extract_$O fileio_$O \
globals_$O inflate_$O match_$O process_$O ttyio_$O $M_$O
LOBJX = $(OBJX)
OBJF = funzip$O $(CRC32)$O cryptf$O globalsf$O inflatef$O ttyiof$O
@@ -306,6 +306,11 @@
-$(CP) unzip.c unzipsfx.c
$(CC) -c $(CF) -DSFX unzipsfx.c
$(RM) unzipsfx.c
+
+crc32_$O: crc32.c $(UNZIP_H) zip.h # unzipsfx only
+ -$(CP) crc32.c crc32_.c
+ $(CC) -c $(CF) -DSFX crc32_.c
+ $(RM) crc32_.c
crctab_$O: crctab.c $(UNZIP_H) zip.h
-$(CP) crctab.c crctab_.c