summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-28 06:04:36 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-28 06:05:08 (GMT)
commit33b69d0e9a09c19225e8f5f34869f74fe60e2d2b (patch)
tree5a36b68985ea3b9cfe9910d39d71c7bf7ec777d9
parentb4e8f5ab5a9e93a96d0dae500cbd9186fcf11d36 (diff)
more tar.gz fixes
-rw-r--r--package/SDL_ttf/Makefile4
-rw-r--r--package/atftp/Makefile2
-rw-r--r--package/bluez/Makefile1
-rw-r--r--package/diffutils/Makefile2
-rw-r--r--package/drbd/Makefile6
-rw-r--r--package/elinks/Makefile3
-rw-r--r--package/gawk/Makefile2
-rw-r--r--package/giflib/Makefile2
-rw-r--r--package/htpdate/Makefile4
-rw-r--r--package/irssi/Makefile2
-rw-r--r--package/maradns/Makefile2
-rw-r--r--package/mkfontdir/Makefile2
-rw-r--r--package/monit/Makefile7
-rw-r--r--package/mutt/Makefile2
-rw-r--r--package/polipo/Makefile2
-rw-r--r--package/serdisplib/Makefile2
-rw-r--r--package/shat/Makefile4
-rw-r--r--package/sispmctl/Makefile2
-rw-r--r--package/squid/Makefile4
-rw-r--r--package/sysfsutils/Makefile2
-rw-r--r--package/taglib/Makefile7
-rw-r--r--package/taglib/src/taglib.pc (renamed from package/taglib/files/taglib.pc)0
-rw-r--r--package/xdpyinfo/Makefile4
-rw-r--r--package/xinput_calibrator/Makefile2
-rw-r--r--package/xlsfonts/Makefile4
25 files changed, 56 insertions, 18 deletions
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
index 53e49e1..659646d 100644
--- a/package/SDL_ttf/Makefile
+++ b/package/SDL_ttf/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= SDL_ttf
PKG_VERSION:= 2.0.10
PKG_RELEASE:= 2
PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b
-PKG_DESCR:= TrueType fonts in your SDL applications
+PKG_DESCR:= truetype fonts for SDL applications
PKG_SECTION:= libs
PKG_DEPENDS:= libsdl libfreetype
PKG_BUILDDEP:= sdl freetype gettext-tiny
@@ -16,6 +16,8 @@ PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/
PKG_LIBNAME:= libsdl-ttf
PKG_OPTS:= dev
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 7d5eefa..0d4f140 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= readline ncurses
PKG_URL:= http://freshmeat.net/projects/atftp/
PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
PKG_LIBC_DEPENDS:= uclibc glibc
PKG_SUBPKGS:= ATFTP ATFTPD
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index d107d91..b4bc704 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -23,7 +23,6 @@ AUTOTOOL_STYLE:= autoreconf
ifeq ($(ADK_STATIC),y)
XAKE_FLAGS+= CCLD="$(TARGET_CC) -all-static -pthread"
endif
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS+= -lncurses
CONFIGURE_ENV+= ac_cv_prog_cc_pie=no
CONFIGURE_ARGS+= --enable-tools \
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index 91aa25d..cc0e4f1 100644
--- a/package/diffutils/Makefile
+++ b/package/diffutils/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/diffutils/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DIFFUTILS,diffutils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index 1e1308b..a80363f 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -7,11 +7,13 @@ PKG_NAME:= drbd
PKG_VERSION:= 8.4.4
PKG_RELEASE:= 2
PKG_MD5SUM:= b51815343c1a9151e2936b3b97520388
-PKG_DESCR:= DRBD admin tools
+PKG_DESCR:= admin tools for drbd
PKG_SECTION:= fs
PKG_URL:= http://www.drbd.org/
PKG_SITES:= http://oss.linbit.com/drbd/8.4/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
PKG_LIBC_DEPENDS:= uclibc glibc
include $(TOPDIR)/mk/package.mk
@@ -26,7 +28,7 @@ CONFIGURE_ARGS+= --with-distro=generic \
--without-xen \
--without-udev
-post-install:
+drbd-install:
$(INSTALL_DIR) $(IDIR_DRBD)/etc
$(CP) ./files/drbd.conf $(IDIR_DRBD)/etc
$(INSTALL_DIR) $(IDIR_DRBD)/usr/lib/drbd
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index c5f10a8..77b5cf1 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -15,6 +15,8 @@ PKG_URL:= http://elinks.or.cz/
PKG_SITES:= http://elinks.or.cz/download/
PKG_NOPARALLEL:= 1
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
PKG_FLAVOURS_ELINKS:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
@@ -23,7 +25,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS+= -fPIC
CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes
CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index 726fa3f..1a99bea 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gawk
PKG_VERSION:= 4.0.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 51e417b71287629940051e6f652c6492
+PKG_MD5SUM:= a42be7536a62d0bcb99ca92467d61660
PKG_DESCR:= GNU awk
PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/gawk/
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
index 1f0857e..8229a3c 100644
--- a/package/giflib/Makefile
+++ b/package/giflib/Makefile
@@ -13,6 +13,8 @@ PKG_URL:= http://sourceforge.net/projects/giflib/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
PKG_OPTS:= dev
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index ec633c5..f7800da 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -7,11 +7,13 @@ PKG_NAME:= htpdate
PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 40f193e3d7220265f6e6f8d4d7f887da
-PKG_DESCR:= an HTP (Hypertext Time Protocol) implementation
+PKG_DESCR:= HTP (Hypertext Time Protocol) implementation
PKG_SECTION:= ntp
PKG_URL:= http://www.vervest.org/htp/
PKG_SITES:= http://www.vervest.org/htp/archive/c/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 554173a..4d37e20 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= glib ncurses
PKG_URL:= http://www.irssi.org/
PKG_SITES:= http://www.irssi.org/files/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
PKG_FLAVOURS_IRSSI:= WITH_SSL WITH_IPV6
PKGFD_WITH_SSL:= enable SSL/TLS support
PKGFS_WITH_SSL:= libopenssl
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 401ea71..46f241f 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -14,6 +14,8 @@ PKG_URL:= http://www.maradns.org
PKG_SITES:= http://www.maradns.org/download/1.4/${PKG_VERSION}/
PKG_NOPARALLEL:= 1
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/mkfontdir/Makefile b/package/mkfontdir/Makefile
index 8671e92..7ad7df4 100644
--- a/package/mkfontdir/Makefile
+++ b/package/mkfontdir/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:= mkfontscale
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= noscripts
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,MKFONTDIR,mkfontdir,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/monit/Makefile b/package/monit/Makefile
index 5543fed..af96c74 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -7,20 +7,23 @@ PKG_NAME:= monit
PKG_VERSION:= 5.6
PKG_RELEASE:= 2
PKG_MD5SUM:= 19dfc1ce8512e832134d06eedd96ba50
-PKG_DESCR:= An utility for system services monitoring
+PKG_DESCR:= utility for system services monitoring
PKG_SECTION:= admin
PKG_DEPENDS:= libpthread libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://mmonit.com/monit/
PKG_SITES:= http://www.tildeslash.com/monit/dist/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= libmonit_cv_setjmp_available=yes \
libmonit_cv_vsnprintf_c99_conformant=yes
-CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr" \
+CONFIGURE_ARGS+= --with-ssl \
+ --with-ssl-dir="${STAGING_TARGET_DIR}/usr" \
--without-pam
monit-install:
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index 05bb509..18cdeac 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -15,6 +15,8 @@ PKG_URL:= http://www.mutt.org/
PKG_SITES:= ftp://ftp.mutt.org/mutt/devel/ \
http://ftp.hi.is/pub/mutt/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/polipo/Makefile b/package/polipo/Makefile
index 7ab1e8e..9422a49 100644
--- a/package/polipo/Makefile
+++ b/package/polipo/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= proxy
PKG_URL:= http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/
PKG_SITES:= http://freehaven.net/~chrisd/polipo/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,POLIPO,polipo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index f7f16c5..07f83db 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= libgd libusb-compat
PKG_URL:= http://serdisplib.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/shat/Makefile b/package/shat/Makefile
index 3bc6fc9..f678415 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -7,10 +7,12 @@ PKG_NAME:= shat
PKG_VERSION:= 0.9.7
PKG_RELEASE:= 1
PKG_MD5SUM:= da06846f35838b14d1513523dad84d24
-PKG_DESCR:= a tool for nomadic routing
+PKG_DESCR:= tool for nomadic routing
PKG_SECTION:= net/misc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=shat/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
PKG_LIBC_DEPENDS:= uclibc glibc
include ${TOPDIR}/mk/package.mk
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index 5f1b592..5a12565 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= libusb libusb-compat
PKG_URL:= http://sispmctl.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/squid/Makefile b/package/squid/Makefile
index d3471bd..2ca9477 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= squid
PKG_VERSION:= 3.4.4
PKG_RELEASE:= 3
-PKG_MD5SUM:= b36ab3696485a86b43d9194ac9b6b7fe
-PKG_DESCR:= squid web and cache proxy
+PKG_MD5SUM:= dc2bcb967fc6b15bbbc6b961010c0c00
+PKG_DESCR:= web and cache proxy
PKG_SECTION:= proxy
PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl
PKG_BUILDDEP:= autotool openssl libtool
diff --git a/package/sysfsutils/Makefile b/package/sysfsutils/Makefile
index 370f2b9..4333fc3 100644
--- a/package/sysfsutils/Makefile
+++ b/package/sysfsutils/Makefile
@@ -13,6 +13,8 @@ PKG_URL:= http://linux-diag.sourceforge.net/Sysfsutils.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-diag/sysfsutils/2.1.0/}
PKG_OPTS:= dev
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,SYSFSUTILS,sysfsutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index 9f323fc..296d15c 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= taglib
PKG_VERSION:= 1.9.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 0d35df96822bbd564c5504cb3c2e4d86
-PKG_DESCR:= Audio Meta-Data library
+PKG_DESCR:= audio meta-data library
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= cmake-host zlib
@@ -15,6 +15,8 @@ PKG_URL:= http://taglib.github.com/
PKG_SITES:= http://taglib.github.io/releases/
PKG_OPTS:= dev
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -27,9 +29,6 @@ do-configure:
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_SYSTEM_NAME=Linux .)
-pre-install:
- $(INSTALL_DATA) ./files/taglib.pc $(WRKBUILD)/
-
taglib-install:
$(INSTALL_DIR) $(IDIR_TAGLIB)/usr/lib
$(CP) $(WRKINST)/usr/lib/libtag*.so* \
diff --git a/package/taglib/files/taglib.pc b/package/taglib/src/taglib.pc
index 788eed3..788eed3 100644
--- a/package/taglib/files/taglib.pc
+++ b/package/taglib/src/taglib.pc
diff --git a/package/xdpyinfo/Makefile b/package/xdpyinfo/Makefile
index faa321b..41016cc 100644
--- a/package/xdpyinfo/Makefile
+++ b/package/xdpyinfo/Makefile
@@ -7,13 +7,15 @@ PKG_NAME:= xdpyinfo
PKG_VERSION:= 1.3.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 588a84f9762c7e4e2b72508f16005b48
-PKG_DESCR:= xdpyinfo
+PKG_DESCR:= X display info utility
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libxtst
PKG_BUILDDEP:= libXtst
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XDPYINFO,xdpyinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xinput_calibrator/Makefile b/package/xinput_calibrator/Makefile
index e4db834..330c53f 100644
--- a/package/xinput_calibrator/Makefile
+++ b/package/xinput_calibrator/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:= libstdcxx
PKG_URL:= http://github.com/downloads/tias/xinput_calibrator/
PKG_SITES:= http://openadk.org/distfiles/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XINPUT_CALIBRATOR,xinput-calibrator,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile
index 935452b..bfac481 100644
--- a/package/xlsfonts/Makefile
+++ b/package/xlsfonts/Makefile
@@ -7,11 +7,13 @@ PKG_NAME:= xlsfonts
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 7a6bee1512ccdef52fc519a86684891e
-PKG_DESCR:= List X11 fonts
+PKG_DESCR:= list X11 fonts
PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,XLSFONTS,xlsfonts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))