diff --git a/Makefile b/Makefile index c44b29d..ec0b897 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # server. This might be one of core, main, dev, or # perhaps others. # * BRIEF: Short description, should be 50 chars or less -# * SNAPVER: This is the package version. When a package is +# * SLVER: This is the package version. When a package is # changed, but no changes are made to the source code # this value should be increased. This would include # things like usher being modified, changes to default @@ -34,7 +34,7 @@ # * PATCHDIR: This directory should be ./SRC/patches and is # required, whether or not patches are used. # * VERSION: This should be set automatically based on the -# version string in the source directory and SNAPVER. +# version string in the source directory and SLVER. # The default command here should work in many cases, # but certain packages may need to use a different # method. @@ -62,23 +62,23 @@ # of the package. export ARCH = x86_64 -export DEPENDS = bzip2,freetype,glibc,libexpat,util-linux,zlib +export DEPENDS = bzip2,freetype,glibc,libexpat,libpng,util-linux,zlib export BUILDDEPS = expat-dev,freetype-dev,zlib-dev export SRCPKG = $(PACKAGE) export URL = https://www.freedesktop.org/wiki/Software/fontconfig/ REPO = main BRIEF = Library for configuring and customizing font access DESC = Library for configuring and customizing font access -SNAPVER = 0 +SLVER = 1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') PATCHDIR := $(PWD)/SRC/patches export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \ - sed 's/^-//')-$(SNAPVER) + sed 's/^-//')-$(SLVER) -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux DEV := $(PWD)/$(PACKAGE)-dev DEVROOT := $(DEV)/ROOT @@ -125,7 +125,7 @@ $(ROOT): $(SRCDIR)/src/.libs/libfontconfig.so.1.12.0 fi @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ - install -v -d $(DEV)/SNAP && \ + install -v -d $(DEV)/SL && \ install -v -d $(DEVROOT) && \ install -v -d $(DEVROOT)/usr/share/doc/fontconfig-dev && \ cp -v doc/fontconfig-devel/* \ @@ -137,7 +137,7 @@ $(ROOT): $(SRCDIR)/src/.libs/libfontconfig.so.1.12.0 mv $$file $$path; \ done find $(ROOT) -type d -empty -delete && \ - cd $(DEV) && make -f ../Makefile.$(PACKAGE)-dev && mv *.snap ../ + cd $(DEV) && make -f ../Makefile.$(PACKAGE)-dev && mv *.slp ../ test: $(ROOT) @cd $(SRCDIR); \ @@ -146,7 +146,7 @@ test: $(ROOT) clean: @rm -rvf $(ROOT) \ $(DEV) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) diff --git a/Makefile.fontconfig-dev b/Makefile.fontconfig-dev index bbef081..f4be32b 100644 --- a/Makefile.fontconfig-dev +++ b/Makefile.fontconfig-dev @@ -13,4 +13,4 @@ REPO = dev BRIEF = Development files for fontconfig DESC = Development files for fontconfig -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/SNAP/README b/SL/README similarity index 100% rename from SNAP/README rename to SL/README