summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-21 15:20:24 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-21 15:20:24 (GMT)
commit90d5c8b73e8d538e121275b12e714332ca785cff (patch)
treeb70121e4732d658097d1db00c8af381629ec82eb
parent33dd541790614765228a71477e1f8b2b6aa21ce1 (diff)
automatically create development subpackages, without user interaction, depend on gcc for the target, simplifies a lot of library packages
-rw-r--r--BUGS3
-rw-r--r--Makefile4
-rw-r--r--TODO10
-rw-r--r--mk/build.mk2
-rw-r--r--mk/package.mk21
-rw-r--r--mk/pkg-bottom.mk19
-rw-r--r--package/.templatelib/Makefile28
-rw-r--r--package/.templateprog/Makefile29
-rw-r--r--package/DirectFB/Makefile20
-rw-r--r--package/MesaLib/Makefile18
-rw-r--r--package/SDL_gfx/Makefile15
-rw-r--r--package/SDL_ttf/Makefile18
-rw-r--r--package/alsa-lib/Makefile15
-rw-r--r--package/apr/Makefile14
-rw-r--r--package/atk/Makefile17
-rw-r--r--package/avahi/Makefile6
-rw-r--r--package/bigreqsproto/Makefile12
-rw-r--r--package/boost/Makefile10
-rw-r--r--package/cairo/Makefile12
-rw-r--r--package/compositeproto/Makefile10
-rw-r--r--package/cryptsetup/Makefile16
-rw-r--r--package/cups/Makefile15
-rw-r--r--package/curl/Makefile19
-rw-r--r--package/cxxtools/Makefile17
-rw-r--r--package/cyrus-sasl/Makefile15
-rw-r--r--package/damageproto/Makefile10
-rw-r--r--package/db/Makefile14
-rw-r--r--package/dbus-glib/Makefile21
-rw-r--r--package/dbus/Makefile19
-rw-r--r--package/dri2proto/Makefile10
-rw-r--r--package/e2fsprogs/Makefile28
-rw-r--r--package/eglibc/Config.in.manual9
-rw-r--r--package/expat/Makefile16
-rw-r--r--package/faac/Makefile6
-rw-r--r--package/faad2/Makefile8
-rw-r--r--package/file/Makefile13
-rw-r--r--package/fixesproto/Makefile10
-rw-r--r--package/flex/Makefile12
-rw-r--r--package/font-util/Makefile13
-rw-r--r--package/fontcacheproto/Makefile6
-rw-r--r--package/fontconfig/Makefile18
-rw-r--r--package/fontsproto/Makefile10
-rw-r--r--package/freetype/Makefile19
-rw-r--r--package/fuse/Makefile19
-rw-r--r--package/gcc/Makefile35
-rw-r--r--package/gdbm/Makefile14
-rw-r--r--package/gdk-pixbuf/Makefile17
-rw-r--r--package/gettext/Makefile86
-rw-r--r--package/gettext/patches/patch-build-aux_ltmain_sh39
-rw-r--r--package/gettext/patches/patch-gettext-runtime_gnulib-lib_stdio_in_h10
-rw-r--r--package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h11
-rw-r--r--package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h11
-rw-r--r--package/gettext/patches/patch-gettext-tools_gnulib-lib_stdio_in_h10
-rw-r--r--package/gettext/patches/patch-gettext-tools_libgettextpo_stdio_in_h10
-rw-r--r--package/giblib/Makefile5
-rw-r--r--package/giflib/Makefile12
-rw-r--r--package/glib/Makefile13
-rw-r--r--package/glibc/Config.in.manual10
-rw-r--r--package/glibc/Makefile11
-rw-r--r--package/glproto/Makefile10
-rw-r--r--package/gmp/Makefile14
-rw-r--r--package/gtk+/Makefile16
-rw-r--r--package/inputproto/Makefile10
-rw-r--r--package/iptables/Makefile13
-rw-r--r--package/jpeg/Makefile14
-rw-r--r--package/kbproto/Makefile10
-rw-r--r--package/krb5/Makefile19
-rw-r--r--package/libICE/Makefile17
-rw-r--r--package/libIDL/Makefile21
-rw-r--r--package/libSM/Makefile17
-rw-r--r--package/libX11/Makefile17
-rw-r--r--package/libXScrnSaver/Makefile7
-rw-r--r--package/libXau/Makefile20
-rw-r--r--package/libXaw/Makefile14
-rw-r--r--package/libXcomposite/Makefile18
-rw-r--r--package/libXcursor/Makefile18
-rw-r--r--package/libXdamage/Makefile18
-rw-r--r--package/libXdmcp/Makefile19
-rw-r--r--package/libXext/Makefile19
-rw-r--r--package/libXfixes/Makefile18
-rw-r--r--package/libXfont/Makefile18
-rw-r--r--package/libXft/Makefile17
-rw-r--r--package/libXi/Makefile17
-rw-r--r--package/libXinerama/Makefile17
-rw-r--r--package/libXmu/Makefile17
-rw-r--r--package/libXp/Makefile16
-rw-r--r--package/libXpm/Makefile17
-rw-r--r--package/libXrandr/Makefile16
-rw-r--r--package/libXrender/Makefile17
-rw-r--r--package/libXt/Makefile17
-rw-r--r--package/libXtst/Makefile17
-rw-r--r--package/libXv/Makefile18
-rw-r--r--package/libXxf86dga/Makefile7
-rw-r--r--package/libXxf86vm/Makefile18
-rw-r--r--package/libaio/Makefile6
-rwxr-xr-xpackage/libantlr3c/Makefile5
-rw-r--r--package/libao/Makefile7
-rw-r--r--package/libart/Makefile7
-rw-r--r--package/libass/Makefile5
-rw-r--r--package/libaudiofile/Makefile18
-rwxr-xr-xpackage/libavl/Makefile5
-rw-r--r--package/libbluray/Makefile5
-rw-r--r--package/libcapi20/Makefile12
-rw-r--r--package/libcdio/Makefile5
-rwxr-xr-xpackage/libcli/Makefile12
-rw-r--r--package/libdaemon/Makefile5
-rw-r--r--package/libdnet/Makefile18
-rw-r--r--package/libdrm/Makefile18
-rw-r--r--package/libelf/Makefile6
-rw-r--r--package/libevent/Makefile14
-rw-r--r--package/libffi/Makefile12
-rw-r--r--package/libfontenc/Makefile15
-rw-r--r--package/libgcrypt/Makefile18
-rw-r--r--package/libgd/Makefile15
-rw-r--r--package/libglew/Makefile5
-rw-r--r--package/libgpg-error/Makefile18
-rw-r--r--package/libgssglue/Makefile17
-rw-r--r--package/libhugetlbfs/Makefile9
-rw-r--r--package/libiconv/Makefile14
-rw-r--r--package/libid3tag/Makefile7
-rw-r--r--package/libjasper/Makefile5
-rw-r--r--package/libjpeg-turbo/Makefile5
-rw-r--r--package/liblzo/Makefile16
-rw-r--r--package/libmad/Makefile14
-rw-r--r--package/libmicrohttpd/Makefile5
-rw-r--r--package/libmms/Makefile7
-rw-r--r--package/libmnl/Makefile5
-rw-r--r--package/libmodplug/Makefile5
-rw-r--r--package/libmpc/Makefile12
-rw-r--r--package/libmpdclient/Makefile19
-rw-r--r--package/libmpeg2/Makefile5
-rw-r--r--package/libnet/Makefile17
-rw-r--r--package/libnetfilter_acct/Makefile7
-rw-r--r--package/libnetfilter_conntrack/Makefile17
-rw-r--r--package/libnetfilter_cthelper/Makefile7
-rw-r--r--package/libnetfilter_cttimeout/Makefile7
-rw-r--r--package/libnetfilter_log/Makefile18
-rw-r--r--package/libnetfilter_queue/Makefile7
-rw-r--r--package/libnettle/Makefile5
-rw-r--r--package/libnfnetlink/Makefile17
-rw-r--r--package/libnfsidmap/Makefile15
-rw-r--r--package/libnids/Makefile14
-rw-r--r--package/libnl/Makefile17
-rw-r--r--package/libnotify/Makefile7
-rw-r--r--package/libogg/Makefile16
-rw-r--r--package/libol/Makefile7
-rw-r--r--package/libosip2/Makefile7
-rw-r--r--package/libp11/Makefile19
-rw-r--r--package/libpcap/Makefile14
-rw-r--r--package/libpciaccess/Makefile18
-rw-r--r--package/libpng/Makefile17
-rw-r--r--package/libpri/Makefile7
-rw-r--r--package/libpthread-stubs/Makefile10
-rw-r--r--package/libqb/Makefile5
-rw-r--r--package/librpcsecgss/Makefile7
-rw-r--r--package/libsamplerate/Makefile5
-rw-r--r--package/libshout/Makefile7
-rw-r--r--package/libsigc++/Makefile7
-rw-r--r--package/libtasn1/Makefile7
-rw-r--r--package/libtheora/Makefile5
-rw-r--r--package/libtiff/Makefile17
-rw-r--r--package/libtirpc/Makefile14
-rw-r--r--package/libtool/Makefile13
-rw-r--r--package/libtorrent/Makefile5
-rwxr-xr-xpackage/libunistring/Makefile5
-rw-r--r--package/libupnp/Makefile14
-rw-r--r--package/libusb-compat/Makefile17
-rw-r--r--package/libusb/Makefile17
-rw-r--r--package/libvirt/Makefile7
-rw-r--r--package/libvorbis/Makefile14
-rw-r--r--package/libvorbisidec/Makefile7
-rw-r--r--package/libvpx/Makefile5
-rw-r--r--package/libx264/Makefile5
-rw-r--r--package/libxcb/Makefile18
-rw-r--r--package/libxkbfile/Makefile18
-rw-r--r--package/libxml2/Makefile20
-rw-r--r--package/libxslt/Makefile17
-rw-r--r--package/linux-atm/Makefile13
-rw-r--r--package/lm_sensors/Makefile14
-rw-r--r--package/log4cplus/Makefile7
-rw-r--r--package/log4cxx/Makefile15
-rw-r--r--package/lvm/Makefile16
-rw-r--r--package/mpfr/Makefile12
-rw-r--r--package/musl/Config.in.manual9
-rw-r--r--package/mysql/Makefile15
-rw-r--r--package/ncurses/Makefile18
-rw-r--r--package/neon/Makefile21
-rw-r--r--package/nspr/Makefile12
-rw-r--r--package/openct/Makefile21
-rw-r--r--package/openldap/Makefile16
-rw-r--r--package/opensc/Makefile18
-rw-r--r--package/openssl/Makefile16
-rw-r--r--package/orbit2/Makefile19
-rw-r--r--package/pango/Makefile18
-rw-r--r--package/pcre/Makefile19
-rw-r--r--package/pcsc-lite/Makefile19
-rw-r--r--package/pixman/Makefile18
-rw-r--r--package/polarssl/Makefile15
-rw-r--r--package/popt/Makefile16
-rw-r--r--package/postgresql/Makefile14
-rw-r--r--package/printproto/Makefile10
-rw-r--r--package/randrproto/Makefile10
-rw-r--r--package/readline/Makefile16
-rw-r--r--package/recordproto/Makefile10
-rw-r--r--package/renderproto/Makefile10
-rw-r--r--package/resourceproto/Makefile10
-rw-r--r--package/scrnsaverproto/Makefile10
-rw-r--r--package/sdl-image/Makefile19
-rw-r--r--package/sdl/Makefile20
-rw-r--r--package/section.lst1
-rw-r--r--package/sysfsutils/Makefile16
-rw-r--r--package/uclibc/Config.in.manual9
-rw-r--r--package/util-linux/Makefile36
-rw-r--r--package/videoproto/Makefile10
-rw-r--r--package/xcb-proto/Makefile15
-rw-r--r--package/xcmiscproto/Makefile10
-rw-r--r--package/xextproto/Makefile10
-rw-r--r--package/xf86dgaproto/Makefile10
-rw-r--r--package/xf86driproto/Makefile11
-rw-r--r--package/xf86vidmodeproto/Makefile10
-rw-r--r--package/xineramaproto/Makefile10
-rw-r--r--package/xorg-server/Makefile18
-rw-r--r--package/xproto/Makefile10
-rw-r--r--package/xtrans/Makefile10
-rw-r--r--package/zlib/Makefile20
-rw-r--r--scripts/make-ipkg-dir.sh4
-rw-r--r--tools/adk/pkgmaker.c117
227 files changed, 939 insertions, 2244 deletions
diff --git a/BUGS b/BUGS
index f08dabe..40358ba 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,6 @@
+- qemu-sparc with glibc/eglibc does not compile
+- qemu-ppc64 does not boot
+- cris foxboard-lx is broken, binutils failure
- openssh on amd64 does not work, ssh-keygen endless loop
- uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
- qemu-mips64* targets does not boot, kernel problem?
diff --git a/Makefile b/Makefile
index 850a672..49623ff 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,10 @@ dev-help:
@echo ''
@echo 'Adding a new package:'
@echo 'make PKG=foo VER=1.0 newpackage'
+ @echo 'Adding a new simple library package:'
+ @echo 'make PKG=foo VER=1.0 TYPE=lib newpackage'
+ @echo 'Adding a new simple program package:'
+ @echo 'make PKG=foo VER=1.0 TYPE=prog newpackage'
clean: .prereq_done
-@rm -f nohup.out
diff --git a/TODO b/TODO
index 893baa0..fb50f8e 100644
--- a/TODO
+++ b/TODO
@@ -1 +1,9 @@
-nothing right now.
+- port full blown perl
+- implement host build infrastructure, fixes update-patches for the package
+ needed for ncurses, file, mesalib, openldap, python2, ..
+- gcc fixed-includes disabling
+http://www.linuxfromscratch.org/lfs/view/7.1/chapter05/gcc-pass2.html
+- port w3m
+- port libcec for xbmc
+- check xbmc samba/nfs support
+- add support for librtmp in xbmc
diff --git a/mk/build.mk b/mk/build.mk
index 3f0fca1..b597dbc 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -244,7 +244,7 @@ kernelconfig:
# create a new package from package/.template
newpackage:
@echo "Creating new package $(PKG)"
- $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG)
+ $(CP) $(TOPDIR)/package/.template$(TYPE) $(TOPDIR)/package/$(PKG)
pkg=$$(echo $(PKG)|tr '[:lower:]-' '[:upper:]_'); \
$(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile
$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
diff --git a/mk/package.mk b/mk/package.mk
index 9e880d5..ca1b84f 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -98,11 +98,12 @@ build-all-pkgs: ${_IPKGS_COOKIE}
# 4.) dependencies to other packages, $(PKG_DEPENDS)
# 5.) description for the package, $(PKG_DESCR)
# 6.) section of the package, $(PKG_SECTION)
-# 7.) special package options
+# 7.) special package options $(PKG_OPTS)
# noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/target/scripts
# (needed for example for autoconf/automake)
# noremove -> do not remove files from $(STAGING_TARGET_DIR)/target while
# cleaning (needed for toolchain packages like glibc/eglibc)
+# dev -> create a development subpackage with headers and pkg-config files
# should be package format independent and modular in the future
define PKG_template
ALL_PKGOPTS+= $(1)
@@ -111,7 +112,9 @@ PKGDEPS_$(1)= $(4)
PKGDESC_$(1)= $(5)
PKGSECT_$(1)= $(6)
IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
+IPKG_$(1)_DEV= $(PACKAGE_DIR)/$(2)-dev_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
+IDIR_$(1)_DEV= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev
ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
ALL_IPKGS+= $$(IPKG_$(1))
ALL_IDIRS+= $${IDIR_$(1)}
@@ -128,6 +131,7 @@ IDEPEND_$(1):= $$(strip $(4))
_ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control
ICONTROL_$(1)?= $(WRKDIR)/.$(2).control
+ICONTROL_$(1)_DEV?= $(WRKDIR)/.$(2)-dev.control
$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
@echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control
@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
@@ -151,6 +155,13 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
@for file in conffiles preinst postinst prerm postrm; do \
[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
done
+ifneq (,$(filter dev,$(7)))
+ echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control
+ echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control
+ echo "Description: development files for $(2)" >> $(WRKDIR)/.$(2)-dev.control
+ ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DEV} $${ICONTROL_$(1)_DEV} $(3) ${CPU_ARCH}
+ echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DEV}/CONTROL/control
+endif
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
ifeq ($(ADK_DEBUG),)
@@ -222,9 +233,14 @@ ifeq (,$(filter noscripts,$(7)))
endif
ifeq (,$(filter libmix,$(7)))
ifeq (,$(filter libonly,$(7)))
+ifeq (,$(filter devonly,$(7)))
$${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
endif
endif
+endif
+ifneq (,$(filter dev,$(7)))
+ $${PKG_BUILD} $${IDIR_$(1)_DEV} $${PACKAGE_DIR} $(MAKE_TRACE)
+endif
clean-targets: clean-dev-$(1)
@@ -241,6 +257,9 @@ endif
$$(INFO_$(1)): $$(IPKG_$(1))
$(PKG_INSTALL) $$(IPKG_$(1))
+ifneq (,$(filter dev,$(7)))
+ $(PKG_INSTALL) $$(IPKG_$(1)_DEV)
+endif
endef
install-targets:
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 9f92f93..0dd9346 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -12,6 +12,7 @@
# are required, but the do-foo: magic is done here
REORDER_DEPENDENCIES= ${TOPDIR}/scripts/automake.dep
+PKG_LIBNAME?= $(PKG_NAME)
pre-configure:
do-configure:
@@ -142,6 +143,7 @@ else
@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
@exit 1
endif
+ @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}.scripts'
@for a in ${WRKINST}/usr/bin/*-config*; do \
[[ -e $$a ]] || continue; \
sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
@@ -166,6 +168,23 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
fi
endif
@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}'
+ifneq (,$(filter dev,${PKG_OPTS}))
+ mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include
+ test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \
+ find . -name \*.h | \
+ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include
+ mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig
+ test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \
+ find . -name \*.pc | \
+ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig
+ for a in ${WRKINST}/usr/bin/*-config*; do \
+ [[ -e $$a ]] || continue; \
+ mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \
+ cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \
+ chmod 755 $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin/$$(basename $$a); \
+ done
+ #env ${MAKE_ENV} ${MAKE} ${PKG_LIBNAME}-dev-install $(MAKE_TRACE)
+endif
@-cd ${WRKINST}; \
if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \
find lib \( -name lib\*.so\* -o -name lib\*.a \) \
diff --git a/package/.templatelib/Makefile b/package/.templatelib/Makefile
new file mode 100644
index 0000000..8d43316
--- /dev/null
+++ b/package/.templatelib/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= @PKG@
+PKG_VERSION:= @VER@
+PKG_RELEASE:= 1
+PKG_MD5SUM:= add md5sum of package here
+PKG_DESCR:= add short description
+PKG_SECTION:= libs
+PKG_URL:= add project url
+PKG_SITES:= add download url without package name
+PKG_OPTS:= dev
+
+# if downloaded package is not ending with .tar.gz use following
+#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+@PKG@-install:
+ $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/@PKG@*.so* \
+ $(IDIR_@UPKG@)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/.templateprog/Makefile b/package/.templateprog/Makefile
new file mode 100644
index 0000000..ec7ae40
--- /dev/null
+++ b/package/.templateprog/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= @PKG@
+PKG_VERSION:= @VER@
+PKG_RELEASE:= 1
+PKG_MD5SUM:= add md5sum of package here
+PKG_DESCR:= add short description
+PKG_SECTION:= add section
+PKG_DEPENDS:= add dependendant package names
+PKG_BUILDDEP:= add packages which need to be compiled
+PKG_URL:= add project url
+PKG_SITES:= add download url without package name
+
+# if downloaded package is not ending with .tar.gz use following
+#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+@PKG@-install:
+ $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
+ $(IDIR_@UPKG@)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 3b4654e..14eef4e 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= DirectFB
PKG_VERSION:= 1.6.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_EXTRAVER:= 1.6-0
PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906
PKG_DESCR:= Thin graphic library for the Linux framebuffer devices
@@ -14,15 +14,12 @@ PKG_DEPENDS:= libpng libjpeg libfreetype
PKG_BUILDDEP:= libpng jpeg freetype
PKG_URL:= http://www.directfb.org/
PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.6/
-
-PKG_SUBPKGS:= DIRECTFB DIRECTFB_DEV
-PKGSD_DIRECTFB_DEV:= development files for DirectFB
-PKGSC_DIRECTFB_DEV:= devel
+PKG_LIBNAME:= directfb
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV}))
+$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \
@@ -47,7 +44,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
XAKE_FLAGS+= LDFLAGS=$(ADK_TARGET_ABI_CFLAGS)
endif
-post-install:
+directfb-install:
${INSTALL_DIR} ${IDIR_DIRECTFB}/etc
${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc
$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm}
@@ -67,11 +64,4 @@ post-install:
${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \
${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider
-directfb-dev-install:
- ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/directfb ${IDIR_DIRECTFB_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/directfb-config \
- ${IDIR_DIRECTFB_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 008c4eb..e69d274 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= MesaLib
PKG_VERSION:= 8.0.5
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= cda5d101f43b8784fa60bdeaca4056f2
PKG_DESCR:= MESA library
PKG_SECTION:= libs
@@ -15,10 +15,7 @@ PKG_BUILDDEP+= dri2proto glproto expat libXext
PKG_URL:= http://www.mesa3d.org/
PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/
PKG_NEED_CXX:= 1
-
-PKG_SUBPKGS:= MESALIB MESALIB_DEV
-PKGSD_MESALIB_DEV:= MESA headers
-PKGSC_MESALIB_DEV:= devel
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm
@@ -26,8 +23,7 @@ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,MESALIB_DEV,mesalib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MESALIB_DEV},${PKGSC_MESALIB_DEV}))
+$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
@@ -76,12 +72,4 @@ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
${IDIR_MESALIB}/usr/lib/dri/
endif
-mesalib-dev-install:
- $(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- $(IDIR_MESALIB_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile
index 756d9d0..b0e114e 100644
--- a/package/SDL_gfx/Makefile
+++ b/package/SDL_gfx/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= SDL_gfx
PKG_VERSION:= 2.0.22
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 330f291f1f09a1bdf397c9b40d92ca41
PKG_DESCR:= SDL GFX library
PKG_SECTION:= libs
@@ -13,17 +13,14 @@ PKG_DEPENDS:= libsdl
PKG_BUILDDEP:= sdl
PKG_URL:= http://www.ferzkopp.net/joomla/content/view/19/14/
PKG_SITES:= http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+PKG_LIBNAME:= libsdl-gfx
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
-PKG_SUBPKGS:= LIBSDL_GFX LIBSDL_GFX_DEV
-PKGSD_LIBSDL_GFX_DEV:= development files for SDL_gfx
-PKGSC_LIBSDL_GFX_DEV:= devel
-
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_GFX_DEV,libsdl-gfx-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_GFX_DEV},${PKGSC_LIBSDL_GFX_DEV}))
+$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-mmx
@@ -31,8 +28,4 @@ libsdl-gfx-install:
$(INSTALL_DIR) $(IDIR_LIBSDL_GFX)/usr/lib
$(CP) $(WRKINST)/usr/lib/libSDL_gfx.so* $(IDIR_LIBSDL_GFX)/usr/lib
-libsdl-gfx-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBSDL_GFX_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_GFX_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
index d6025f2..d8d9545 100644
--- a/package/SDL_ttf/Makefile
+++ b/package/SDL_ttf/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= SDL_ttf
PKG_VERSION:= 2.0.10
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b
PKG_DESCR:= TrueType fonts in your SDL applications
PKG_SECTION:= libs
@@ -13,27 +13,17 @@ PKG_DEPENDS:= libsdl libfreetype
PKG_BUILDDEP:= sdl freetype gettext-tiny
PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/
PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/
+PKG_LIBNAME:= libsdl-ttf
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
-PKG_SUBPKGS:= LIBSDL_TTF LIBSDL_TTF_DEV
-PKGSD_LIBSDL_TTF_DEV:= development files
-PKGSC_LIBSDL_TTF_DEV:= devel
-
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV}))
+$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libsdl-ttf-install:
$(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib
$(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib
-libsdl-ttf-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_TTF_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 9e1c0be..d450575 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -11,19 +11,15 @@ PKG_DESCR:= ALSA sound library
PKG_SECTION:= libs
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
-PKG_SUBPKGS:= ALSA_LIB ALSA_LIB_DEV
-PKGSD_ALSA_LIB_DEV:= development files for ALSA
-PKGSC_ALSA_LIB_DEV:= devel
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ALSA_LIB_DEV},${PKGSC_ALSA_LIB_DEV}))
+$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CPPFLAGS+= -D_POSIX_C_SOURCE=1
CONFIGURE_ARGS+= --disable-python
@@ -33,11 +29,4 @@ alsa-lib-install:
${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib
${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa
-alsa-lib-dev-install:
- ${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/include/{sys,alsa}
- ${CP} ${WRKINST}/usr/include/sys/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/sys
- ${CP} ${WRKINST}/usr/include/alsa/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/alsa
- ${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 586495e..ba53c9c 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -5,25 +5,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= apr
PKG_VERSION:= 1.4.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 76cc4457fbb71eefdafa27dba8f511fb
PKG_DESCR:= Apache Portable Runtime library
PKG_SECTION:= libs
PKG_DEPENDS:= libpthread
PKG_URL:= http://apr.apache.org/
PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
-
-PKG_SUBPKGS:= APR APR_DEV
-PKGSC_APR_DEV:= devel
-PKGSD_APR_DEV:= apr headers
+PKG_OPTS:= dev
PKG_FLAVOURS_APR:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,APR_DEV,apr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_APR_DEV},${PKGSC_APR_DEV}))
+$(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -57,8 +53,4 @@ apr-install:
${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1
${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/
-apr-dev-install:
- ${INSTALL_DIR} ${IDIR_APR_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_APR_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 58781ae..44ea350 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -5,37 +5,28 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= atk
PKG_VERSION:= 1.33.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 4338e0c94f767714f4786878112750dd
PKG_DESCR:= atk library
PKG_SECTION:= libs
PKG_BUILDDEP:= glib
PKG_URL:= http://www.gnome.org/
PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.33/}
+PKG_LIBNAME:= libatk
+PKG_OPTS:= dev
#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-PKG_SUBPKGS:= LIBATK LIBATK_DEV
-PKGSC_LIBATK_DEV:= devel
-PKGSD_LIBATK_DEV:= libatk headers
-
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBATK,libatk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBATK_DEV,libatk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBATK_DEV},${PKGSC_LIBATK_DEV},${PKG_OPTS}))
libatk-install:
${INSTALL_DIR} ${IDIR_LIBATK}/usr/lib
${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_LIBATK}/usr/lib
-libatk-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBATK_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 6e5330a..ba5db4f 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= avahi
PKG_VERSION:= 0.6.30
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= e4db89a2a403ff4c47d66ac66fad1f43
PKG_DESCR:= mDNS daemon
PKG_SECTION:= dhcp
@@ -13,6 +13,8 @@ PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny gtk+ dbus
PKG_URL:= http://avahi.org/
PKG_SITES:= http://avahi.org/download/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libavahi
+PKG_OPTS:= dev
PKG_SUBPKGS:= AVAHI_DAEMON AVAHI_DNSCONFD LIBAVAHI
PKGSS_AVAHI_DAEMON:= libavahi libdaemon libexpat libintl libgtk dbus
@@ -25,7 +27,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DAEMON},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-glib \
--enable-gtk2 \
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index 2861d2e..b48634a 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -5,21 +5,15 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= bigreqsproto
PKG_VERSION:= 1.1.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_DESCR:= Big Requests Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 9b83369ac7a5eb2bf54c8f34db043a0e
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_BIGREQSPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/bigreqsproto.pc \
- ${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/boost/Makefile b/package/boost/Makefile
index e2f2ed3..6de8a1a 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,22 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= boost
PKG_VERSION:= 1.54.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9
PKG_DESCR:= boost C++ library
PKG_SECTION:= libs
PKG_URL:= http://www.boost.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/}
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32 !m68k
DISTFILES:= boost_1_54_0.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}_1_54_0
-PKG_SUBPKGS:= BOOST BOOST_DEV
-PKGSD_BOOST_DEV:= boost header files
-PKGSC_BOOST_DEV:= devel
-
PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
PKGFD_date_time:= with date-time
@@ -42,8 +39,7 @@ PKGFD_wave:= with wave
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BOOST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,BOOST_DEV,boost-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BOOST_DEV},${PKGSC_BOOST_DEV}))
+$(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 887a604..3fb1142 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cairo
PKG_VERSION:= 1.10.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f
PKG_DESCR:= cairo graphics library
PKG_SECTION:= libs
@@ -15,21 +15,17 @@ PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib
PKG_BUILDDEP+= libXext
PKG_URL:= http://cairographics.org/
PKG_SITES:= http://cairographics.org/releases/
+PKG_OPTS:= dev
#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-PKG_SUBPKGS:= CAIRO CAIRO_DEV
-PKGSC_CAIRO_DEV:= devel
-PKGSD_CAIRO_DEV:= cairo headers
-
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
+$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS},${PKG_OPTS}))
ifeq (,$(filter arm,$(TARGET_ARCH)))
TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS))
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index fa31132..ffcb957 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -8,18 +8,12 @@ PKG_VERSION:= 0.4.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 2dea7c339432b3363faf2d29c208e7b5
PKG_DESCR:= X11 composite headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,COMPOSITEPROTO,compositeproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_COMPOSITEPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_COMPOSITEPROTO}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/compositeproto.pc \
- ${IDIR_COMPOSITEPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index d0dd12b..c98e2e8 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
PKG_VERSION:= 1.3.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1f5b5a9d538e8a3c191fb7dd85b9b013
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
@@ -15,9 +15,7 @@ PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm libgcc
PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm
PKG_URL:= http://cryptsetup.googlecode.com/
PKG_SITES:= http://cryptsetup.googlecode.com/files/
-
-PKG_SUBPKGS:= CRYPTSETUP CRYPTSETUP_DEV
-PKGSC_CRYPTSETUP_DEV:= devel
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !cris
@@ -25,22 +23,16 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CRYPTSETUP_DEV,cryptsetup-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CRYPTSETUP_DEV}))
+$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-selinux
-post-install:
+cryptsetup-install:
${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
${CP} ${WRKINST}/usr/lib/libcryptsetup.so* \
${IDIR_CRYPTSETUP}/usr/lib
${INSTALL_BIN} ${WRKINST}/usr/sbin/cryptsetup \
${IDIR_CRYPTSETUP}/usr/sbin
-cryptsetup-dev-install:
- ${INSTALL_DIR} ${IDIR_CRYPTSETUP_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_CRYPTSETUP_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 6a36d42..adf8dca 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cups
PKG_VERSION:= 1.4.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8776403ad60fea9e85eab9c04d88560d
PKG_DESCR:= Common Unix Printing System
PKG_SECTION:= net/misc
@@ -14,16 +14,13 @@ PKG_BUILDDEP:= zlib
PKG_URL:= http://www.cups.org/
PKG_SITES:= ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
PKG_NEED_CXX:= 1
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
-PKG_SUBPKGS:= CUPS CUPS_DEV
-PKGSC_CUPS_DEV:= devel
-
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV}))
+$(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= ac_cv_func_sigset=no \
OPTIM='-fPIC'
@@ -53,7 +50,7 @@ else
XAKE_FLAGS+= OPTIM='-fPIC'
endif
-post-install:
+cups-install:
${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
${INSTALL_DIR} ${IDIR_CUPS}/etc/cups
@@ -84,8 +81,4 @@ post-install:
${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
-cups-dev-install:
- ${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 146a476..75fab01 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -13,13 +13,13 @@ PKG_DEPENDS:= libcurl
PKG_BUILDDEP:= zlib
PKG_URL:= http://curl.haxx.se/
PKG_SITES:= http://curl.haxx.se/download/
+PKG_LIBNAME:= libcurl
+PKG_OPTS:= dev
-PKG_SUBPKGS:= CURL LIBCURL LIBCURL_DEV
+PKG_SUBPKGS:= CURL LIBCURL
PKGSD_LIBCURL:= a client-side URL transfer library
PKGSC_LIBCURL:= libs
PKGSS_LIBCURL:= zlib
-PKGSD_LIBCURL_DEV:= development files for libcurl
-PKGSC_LIBCURL_DEV:= devel
PKG_FLAVOURS_CURL:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
@@ -36,8 +36,7 @@ PKGCB_WITH_GNUTLS:= gnutls
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL}))
-$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV}))
+$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS}))
ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y)
CONFIGURE_ARGS+= --without-ssl \
@@ -90,14 +89,4 @@ libcurl-install:
${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib
-libcurl-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libcurl.a ${IDIR_LIBCURL_DEV}/usr/lib
- ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
- ${CP} ${WRKINST}/usr/include/curl/*.h \
- ${IDIR_LIBCURL_DEV}/usr/include/curl
- ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/curl-config \
- ${IDIR_LIBCURL_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 9470d8f..e72624b 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cxxtools
PKG_VERSION:= 2.1.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2026a2bb23b966f13893167b4dbc5d70
PKG_DESCR:= a collection of general-purpose C++ classes (libraries)
PKG_SECTION:= libs
@@ -15,17 +15,13 @@ PKG_URL:= http://www.tntnet.org/
PKG_SITES:= http://www.tntnet.org/download/
PKG_NEED_CXX:= 1
PKG_CXX:= CXXTOOLS
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !arm !avr32
-PKG_SUBPKGS:= CXXTOOLS CXXTOOLS_DEV
-PKGSC_CXXTOOLS_DEV:= devel
-PKGSD_CXXTOOLS_DEV:= a collection of general-purpose C++ classes (headers)
-
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
@@ -45,11 +41,4 @@ cxxtools-install:
${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib
-cxxtools-dev-install:
- ${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_CXXTOOLS_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/bin
- ${CP} ${WRKINST}/usr/bin/cxxtools-config ${IDIR_CXXTOOLS_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 9fd2e6f..65169cf 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cyrus-sasl
PKG_VERSION:= 2.1.23
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2eb0e48106f0e9cd8001e654f267ecbc
PKG_DESCR:= a general purpose authentication library
PKG_SECTION:= libs
@@ -14,15 +14,12 @@ PKG_DEPENDS:= libopenssl
PKG_URL:= http://asg.web.cmu.edu/sasl/
PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/
PKG_NOPARALLEL:= 1
-
-PKG_SUBPKGS:= LIBSASL2 LIBSASL2_DEV
-PKGSD_LIBSASL2_DEV:= sasl2 headers
-PKGSC_LIBSASL2_DEV:= devel
+PKG_LIBNAME:= libsasl2
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSASL2_DEV,libsasl2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSASL2_DEV},${PKGSC_LIBSASL2_DEV}))
+$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-staticdlopen \
--enable-cram \
@@ -78,8 +75,4 @@ libsasl2-install:
${CP} ${WRKINST}/usr/lib/sasl2/lib*.so* \
${IDIR_LIBSASL2}/usr/lib/sasl2
-libsasl2-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBSASL2_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBSASL2_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index 4269c2a..44c8094 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -8,18 +8,12 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= bf8c47b7f48625230cff155180f8ddce
PKG_DESCR:= X DAMAGE Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DAMAGEPROTO,damageproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_DAMAGEPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_DAMAGEPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/damageproto.pc \
- ${IDIR_DAMAGEPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/db/Makefile b/package/db/Makefile
index 82d69ef..3a65ba8 100644
--- a/package/db/Makefile
+++ b/package/db/Makefile
@@ -5,24 +5,20 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= db
PKG_VERSION:= 5.3.21
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 3fda0b004acdaa6fa350bfc41a3b95ca
PKG_DESCR:= disk file format database which stores key/data-pairs in single files
PKG_SECTION:= db
PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db
PKG_SITES:= http://www.openadk.org/distfiles/
PKG_NEED_CXX:= 1
-
-PKG_SUBPKGS:= LIBDB LIBDB_DEV
-PKGSC_LIBDB_DEV:= devel
-PKGSD_LIBDB_DEV:= libdb headers
+PKG_OPTS:= dev
WRKBUILD= ${WRKSRC}/build_unix
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBDB_DEV,libdb-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDB_DEV},${PKGSC_LIBDB_DEV}))
+$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_PROG:= dist/configure
@@ -45,8 +41,4 @@ libdb-install:
${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib
${CP} ${WRKINST}/usr/lib/libdb*.so ${IDIR_LIBDB}/usr/lib
-libdb-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBDB_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBDB_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index a937f59..204c66f 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= dbus-glib
PKG_VERSION:= 0.86
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= cd0ab148fb0c786fc88be49d19971f50
PKG_DESCR:= DBUS glib bindings
PKG_SECTION:= libs
@@ -13,15 +13,11 @@ PKG_DEPENDS:= dbus glib
PKG_BUILDDEP:= dbus glib
PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings
PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-glib/
-
-PKG_SUBPKGS:= DBUS_GLIB DBUS_GLIB_DEV
-PKGSC_DBUS_GLIB_DEV:= devel
-PKGSD_DBUS_GLIB_DEV:= dbus-glib headers
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DBUS_GLIB_DEV,dbus-glib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_GLIB_DEV},${PKGSC_DBUS_GLIB_DEV}))
+$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-checks
@@ -32,15 +28,4 @@ dbus-glib-install:
$(CP) $(WRKINST)/usr/lib/libdbus-glib-1.so* \
$(IDIR_DBUS_GLIB)/usr/lib
-dbus-glib-dev-install:
- $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_DBUS_GLIB_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig
- ${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig
- $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/dbus-binding-tool \
- $(IDIR_DBUS_GLIB_DEV)/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index de0ed66..7f7f570 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= dbus
PKG_VERSION:= 1.6.12
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a70edc50524f258eaf5c9a9994ed8748
PKG_DESCR:= DBUS library and daemon
PKG_SECTION:= libs
@@ -13,19 +13,15 @@ PKG_DEPENDS:= libexpat libx11 libuuid
PKG_BUILDDEP:= expat libX11 util-linux
PKG_URL:= http://dbus.freedesktop.org/
PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/
-
-PKG_SUBPKGS:= DBUS DBUS_DEV
-PKGSC_DBUS_DEV:= devel
-PKGSD_DBUS_DEV:= DBUS headers
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS}))
TARGET_LDFLAGS+= -luuid
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -56,15 +52,10 @@ dbus-install:
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-send ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-monitor ${IDIR_DBUS}/usr/bin
-
-dbus-dev-install:
- ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include
+ # workaround for dev subpackage
${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
$(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
- ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_DBUS_DEV}/usr/lib/pkgconfig
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile
index 0083b5a..402144b 100644
--- a/package/dri2proto/Makefile
+++ b/package/dri2proto/Makefile
@@ -8,18 +8,12 @@ PKG_VERSION:= 2.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 873142af5db695537cfe05e01d13541f
PKG_DESCR:= DRI protocol headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DRI2PROTO,dri2proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_DRI2PROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_DRI2PROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/dri2proto.pc \
- ${IDIR_DRI2PROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 80dad73..a04bd96 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= e2fsprogs
PKG_VERSION:= 1.42.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8ef664b6eb698aa6b733df59b17b9ed4
PKG_DESCR:= Ext2/3/4 filesystem utilities
PKG_SECTION:= fs
@@ -13,22 +13,18 @@ PKG_DEPENDS:= libcom-err libuuid libblkid libpthread
PKG_BUILDDEP:= util-linux
PKG_URL:= http://e2fsprogs.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
+PKG_OPTS:= dev
PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF
PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC
-PKG_SUBPKGS+= LIBCOM_ERR_DEV LIBSS_DEV
PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS
PKGSD_LIBE2FS:= e2fsprogs library
PKGSC_LIBE2FS:= libs
PKGSD_LIBCOM_ERR:= Common error library
PKGSC_LIBCOM_ERR:= libs
-PKGSD_LIBCOM_ERR_DEV:= Common error headers
-PKGSC_LIBCOM_ERR_DEV:= devel
PKGSD_LIBSS:= Subsystem command parsing library
PKGSC_LIBSS:= libs
-PKGSD_LIBSS_DEV:= Subsystem command parsing headers
-PKGSC_LIBSS_DEV:= devel
PKGSD_E2FSCK_STATIC:= Static build of e2fsck
PKGSC_E2FSCK_STATIC:= fs
PKGSD_RESIZE2FS:= Resize FS utility
@@ -46,11 +42,11 @@ PKGSS_MKE2FS:= libe2fs
include ${TOPDIR}/mk/package.mk
+$(eval $(call PKG_template,E2FSPROGS,e2fsprogs,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
$(eval $(call PKG_template,LIBCOM_ERR_DEV,libcom-err-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR_DEV},${PKGSC_LIBCOM_ERR_DEV}))
$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
-$(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS_DEV},${PKGSC_LIBSS_DEV}))
$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
@@ -75,6 +71,11 @@ ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin
endif
+e2fsprogs-install:
+ # workaround for dev subpackage
+ ${CP} ${WRKINST}/usr/bin/compile_et \
+ ${IDIR_E2FSPROGS_DEV}/usr/bin
+
libe2fs-install:
${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
${INSTALL_DATA} ${WRKBUILD}/misc/mke2fs.conf ${IDIR_LIBE2FS}/etc
@@ -105,25 +106,12 @@ libcom-err-install:
${IDIR_LIBCOM_ERR}/usr/lib
${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin
-libcom-err-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/include/et
- ${CP} ${WRKINST}/usr/include/et/com_err.h \
- ${IDIR_LIBCOM_ERR_DEV}/usr/include/et
- ${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/bin
- ${CP} ${WRKINST}/usr/bin/compile_et \
- ${IDIR_LIBCOM_ERR_DEV}/usr/bin
-
libss-install:
${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib
${CP} ${WRKINST}/usr/lib/libss.so* \
${IDIR_LIBSS}/usr/lib
${CP} ${WRKINST}/usr/bin/mk_cmds ${STAGING_HOST_DIR}/bin
-libss-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBSS_DEV}/usr/include/ss
- ${CP} ${WRKINST}/usr/include/ss/ss*.h \
- ${IDIR_LIBSS_DEV}/usr/include/ss
-
e2fsck-static-install:
ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
index fd6d6fb..da237f7 100644
--- a/package/eglibc/Config.in.manual
+++ b/package/eglibc/Config.in.manual
@@ -15,12 +15,3 @@ config ADK_PACKAGE_EGLIBC_STATIC
depends on ADK_TARGET_LIB_EGLIBC
help
embedded GNU C library (static version).
-
-config ADK_PACKAGE_EGLIBC_DEV
- prompt "eglibc-dev........... C library development files"
- tristate
- default n
- depends on ADK_TARGET_LIB_EGLIBC
- help
- embedded GNU C library header files.
-
diff --git a/package/expat/Makefile b/package/expat/Makefile
index 0ff841f..c5f676d 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -5,32 +5,24 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= expat
PKG_VERSION:= 2.0.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= ee8b492592568805593f81f8cdf2a04c
PKG_DESCR:= a XML parsing library
PKG_SECTION:= libs
PKG_URL:= http://expat.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/}
-
-PKG_SUBPKGS:= LIBEXPAT LIBEXPAT_DEV
-PKGSD_LIBEXPAT_DEV:= development files for expat
-PKGSC_LIBEXPAT_DEV:= devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV}))
-post-install:
+libexpat-install:
${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/
-libexpat-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBEXPAT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBEXPAT_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/faac/Makefile b/package/faac/Makefile
index b54a35a..df407db 100644
--- a/package/faac/Makefile
+++ b/package/faac/Makefile
@@ -11,12 +11,12 @@ PKG_DESCR:= AAC encoder
PKG_SECTION:= libs
PKG_URL:= http://www.audiocoding.com/faac.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/}
-
-PKG_SUBPKGS:= LIBFAAC
+PKG_LIBNAME:= libfaac
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBFAAC,libfaac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFAAC,libfaac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --without-mp4v2
diff --git a/package/faad2/Makefile b/package/faad2/Makefile
index 9d2be1f..611f5ed 100644
--- a/package/faad2/Makefile
+++ b/package/faad2/Makefile
@@ -11,12 +11,12 @@ PKG_DESCR:= A MP4 decoding library
PKG_SECTION:= libs
PKG_URL:= http://sourceforge.net/projects/faac/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/}
-
-PKG_SUBPKGS:= LIBFAAD2
+PKG_LIBNAME:= libfaad2
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
# check for lrintf fails on Darwin, don't know why
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --without-mpeg4ip \
--without-xmms
TARGET_LDFLAGS+= -lm
-post-install:
+libfaad2-install:
${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib
${CP} ${WRKINST}/usr/lib/libfaad.so* ${IDIR_LIBFAAD2}/usr/lib/
diff --git a/package/file/Makefile b/package/file/Makefile
index c855f41..7c3fc84 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -13,18 +13,17 @@ PKG_DEPENDS:= libmagic
PKG_URL:= http://www.darwinsys.com/file
PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \
ftp://ftp.astron.com/pub/file/
+PKG_LIBNAME:= libmagic
+PKG_OPTS:= dev
-PKG_SUBPKGS:= FILE LIBMAGIC LIBMAGIC_DEV
+PKG_SUBPKGS:= FILE LIBMAGIC
PKGSD_LIBMAGIC:= file type guesser library
PKGSC_LIBMAGIC:= libs
-PKGSD_LIBMAGIC_DEV:= file type guesser headers
-PKGSC_LIBMAGIC_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC}))
-$(eval $(call PKG_template,LIBMAGIC_DEV,libmagic-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC_DEV},${PKGSD_LIBMAGIC_DEV},${PKGSC_LIBMAGIC_DEV}))
+$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC},${PKG_OPTS}))
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -46,8 +45,4 @@ libmagic-install:
${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib
${CP} ${WRKINST}/usr/lib/libmagic.so* ${IDIR_LIBMAGIC}/usr/lib
-libmagic-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBMAGIC_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMAGIC_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile
index 88572de..a46fd50 100644
--- a/package/fixesproto/Makefile
+++ b/package/fixesproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= fixesproto
PKG_VERSION:= 5.0
PKG_RELEASE:= 1
PKG_DESCR:= XFIXES Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 1b3115574cadd4cbea1f197faa7c1de4
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FIXESPROTO,fixesproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_FIXESPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_FIXESPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_FIXESPROTO}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/fixesproto.pc \
- ${IDIR_FIXESPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/flex/Makefile b/package/flex/Makefile
index bd7bc73..ca7f811 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -11,24 +11,18 @@ PKG_DESCR:= fast lexical analyzer
PKG_SECTION:= lang
PKG_URL:= http://flex.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
-
-PKG_SUBPKGS:= FLEX FLEX_DEV
-PKGSD_FLEX_DEV:= fast lexical analyzer (static library)
-PKGSC_FLEX_DEV:= devel
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FLEX_DEV,flex-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FLEX_DEV},${PKGSC_FLEX_DEV}))
+$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
flex-install:
${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
-
-flex-dev-install:
+ # workaround for dev subpackage
${INSTALL_DIR} ${IDIR_FLEX_DEV}/usr/lib
${CP} ${WRKINST}/usr/lib/libfl.a \
${IDIR_FLEX_DEV}/usr/lib
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index 150a556..60aabeb 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -5,21 +5,17 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= font-util
PKG_VERSION:= 1.1.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d
PKG_DESCR:= font util
PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= FONT_UTIL FONT_UTIL_DEV
-PKGSC_FONT_UTIL_DEV:= devel
-PKGSD_FONT_UTIL_DEV:= font util headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONT_UTIL_DEV},${PKGSC_FONT_UTIL_DEV},${PKG_OPTS}))
# XXX: Push the mapping files to a place where we can find them
# again when compiling the actual fonts. This is ugly as hell,
@@ -41,9 +37,4 @@ font-util-install:
${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
-font-util-dev-install:
- ${INSTALL_DIR} ${IDIR_FONT_UTIL_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fontutil.pc \
- ${IDIR_FONT_UTIL_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile
index dec821d..6f6e8e0 100644
--- a/package/fontcacheproto/Makefile
+++ b/package/fontcacheproto/Makefile
@@ -7,8 +7,12 @@ PKG_NAME:= fontcacheproto
PKG_VERSION:= 0.1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= dc8c34a8c3559bf3b008bcdf7ba5a743
+PKG_SECTION:= devel
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FONTCACHEPROTO,fontcacheproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 72e9960..b068355 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= fontconfig
PKG_VERSION:= 2.10.91
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 0a8edc63aa79377b2bf44e469d5bbbb7
PKG_DESCR:= library for configuring and customizing font access
PKG_SECTION:= libs
@@ -13,19 +13,15 @@ PKG_DEPENDS:= libxml2 libiconv
PKG_BUILDDEP:= freetype libxml2 libiconv
PKG_URL:= http://fontconfig.org/
PKG_SITES:= http://fontconfig.org/release/
-
-PKG_SUBPKGS:= FONTCONFIG FONTCONFIG_DEV
-PKGSD_FONTCONFIG_DEV:= configuring and customizing font access headers
-PKGSC_FONTCONFIG_DEV:= devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,FONTCONFIG_DEV,fontconfig-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONTCONFIG_DEV},${PKGSC_FONTCONFIG_DEV},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS+= -liconv
@@ -38,12 +34,4 @@ fontconfig-install:
${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib
$(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts
-fontconfig-dev-install:
- ${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/fontconfig.pc \
- ${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_FONTCONFIG_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile
index 9bc889f..51e1fb6 100644
--- a/package/fontsproto/Makefile
+++ b/package/fontsproto/Makefile
@@ -8,18 +8,12 @@ PKG_VERSION:= 2.1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 642a8c5700519a84efe28944afe5cbdc
PKG_DESCR:= Fonts extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_FONTSPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_FONTSPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_FONTSPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fontsproto.pc \
- ${IDIR_FONTSPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index fa04881..7db8a87 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -13,32 +13,19 @@ PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.freetype.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/}
-
-PKG_SUBPKGS:= LIBFREETYPE LIBFREETYPE_DEV
-PKGSD_LIBFREETYPE_DEV:= FreeType headers
-PKGSC_LIBFREETYPE_DEV:= devel
+PKG_LIBNAME:= libfreetype
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBFREETYPE_DEV,libfreetype-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFREETYPE_DEV},${PKGSC_LIBFREETYPE_DEV},${PKG_OPTS}))
libfreetype-install:
${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib
${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib
-libfreetype-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFREETYPE_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/freetype2.pc \
- ${IDIR_LIBFREETYPE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/freetype-config \
- ${IDIR_LIBFREETYPE_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 84e6474..ddf0fd2 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -12,18 +12,17 @@ PKG_SECTION:= fs
PKG_DEPENDS:= kmod-fuse-fs libfuse
PKG_URL:= http://fuse.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
+PKG_LIBNAME:= libfuse
+PKG_OPTS:= dev
-PKG_SUBPKGS:= FUSE_UTILS LIBFUSE LIBFUSE_DEV
+PKG_SUBPKGS:= FUSE_UTILS LIBFUSE
PKGSD_LIBFUSE:= FUSE library
PKGSC_LIBFUSE:= libs
-PKGSD_LIBFUSE_DEV:= FUSE headers
-PKGSC_LIBFUSE_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFUSE,libfuse,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE},${PKGSC_LIBFUSE}))
-$(eval $(call PKG_template,LIBFUSE_DEV,libfuse-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE_DEV},${PKGSC_LIBFUSE_DEV}))
+$(eval $(call PKG_template,LIBFUSE,libfuse,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE},${PKGSC_LIBFUSE},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-lib \
--enable-util \
@@ -44,14 +43,4 @@ libfuse-install:
${CP} ${WRKINST}/usr/lib/libulockmgr.so* \
${IDIR_LIBFUSE}/usr/lib
-libfuse-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBFUSE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_LIBFUSE_DEV}/usr/include/fuse
- ${INSTALL_DATA} ${WRKINST}/usr/include/*.h \
- ${IDIR_LIBFUSE_DEV}/usr/include
- ${INSTALL_DATA} ${WRKINST}/usr/include/fuse/*.h \
- ${IDIR_LIBFUSE_DEV}/usr/include/fuse
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fuse.pc \
- ${IDIR_LIBFUSE_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index e73a890..6c6bdf0 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -4,7 +4,7 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gcc/Makefile.inc
-PKG_DESCR:= GNU compiler collection
+PKG_DESCR:= GNU C compiler
PKG_SECTION:= lang
PKG_OPTS:= noremove
PKG_DEPENDS:= libmpc libgmp mpfr
@@ -12,11 +12,15 @@ PKG_BUILDDEP:= libmpc gmp mpfr
PKG_ARCH_DEPENDS:= !avr32
+PKG_SUBPKGS:= GCC GXX
+PKGSD_GXX:= GNU C++ compiler
+
WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CPPFLAGS:= ''
TARGET_CFLAGS:= ''
@@ -26,15 +30,19 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI)
endif
+ifeq ($(ADK_PACKAGE_GXX),y)
+CONFIGURE_ARGS+= --enable-languages=c,c++
+else
+CONFIGURE_ARGS+= --enable-languages=c
+endif
+
CONFIGURE_ENV+= have_sys_sdt_h=no
-CONFIGURE_ARGS+= --enable-languages=c,c++ \
- --host=$(REAL_GNU_TARGET_NAME) \
+CONFIGURE_ARGS+= --host=$(REAL_GNU_TARGET_NAME) \
--target=$(REAL_GNU_TARGET_NAME) \
--disable-__cxa_atexit \
--without-headers \
--libexecdir=/usr/lib \
--disable-libssp \
- --disable-nls \
--disable-sjlj-exceptions \
--disable-biarch \
--disable-libmudflap \
@@ -46,17 +54,24 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ \
# disable honour cflags stuff
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-post-install:
+pre-configure:
+ $(SED) 's@\./fixinc\.sh@-c true@' $(WRKSRC)/gcc/Makefile.in
+
+gcc-install:
${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
- ${INSTALL_DIR} ${IDIR_GCC}/lib ${IDIR_GCC}/usr/include/c++
+ ${INSTALL_DIR} ${IDIR_GCC}/lib
${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
- ${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/
- cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++
cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc
${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
- ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/
cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp .
${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
+g++-install:
+ ${INSTALL_DIR} ${IDIR_GCC}/usr/bin
+ ${INSTALL_DIR} ${IDIR_GCC}/usr/include/c++
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/
+ cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++
+ ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index bd6c369..b880623 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -5,21 +5,17 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gdbm
PKG_VERSION:= 1.8.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1d1b1d5c0245b1c00aff92da751e9aa1
PKG_DESCR:= disk file format database
PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/gdbm/
PKG_SITES:= ${MASTER_SITE_GNU:=gdbm/}
-
-PKG_SUBPKGS:= LIBGDBM LIBGDBM_DEV
-PKGSC_LIBGDBM_DEV:= devel
-PKGSD_LIBGDBM_DEV:= libgdbm headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGDBM_DEV,libgdbm-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGDBM_DEV},${PKGSC_LIBGDBM_DEV}))
+$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
XAKE_FLAGS+= BINOWN=`id -u` \
BINGRP=`id -g` \
@@ -29,8 +25,4 @@ libgdbm-install:
${INSTALL_DIR} ${IDIR_LIBGDBM}/usr/lib
${CP} ${WRKINST}/usr/lib/libgdbm.so* ${IDIR_LIBGDBM}/usr/lib
-libgdbm-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBGDBM_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBGDBM_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index 44ca7a0..719f614 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -5,23 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= gdk-pixbuf
PKG_VERSION:= 2.24.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= bd7c2a9d23b573db467e39833f12103d
PKG_DESCR:= GDK pixbuf library
PKG_SECTION:= libs
PKG_BUILDDEP:= jpeg libtiff
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/
PKG_NEED_CXX:= 1
-
-PKG_SUBPKGS:= GDK_PIXBUF GDK_PIXBUF_DEV
-PKGSC_GDK_PIXBUF_DEV:= devel
+PKG_OPTS:= dev
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GDK_PIXBUF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GDK_PIXBUF_DEV,gdk-pixbuf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GDK_PIXBUF_DEV}))
+$(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= gio_can_sniff=no
@@ -34,12 +31,4 @@ gdk-pixbuf-install:
$(CP) ./files/loaders.cache \
$(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-gdk-pixbuf-dev-install:
- $(INSTALL_DIR) $(IDIR_GDK_PIXBUF_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_GDK_PIXBUF_DEV)/usr/lib/pkgconfig
- $(INSTALL_DIR) $(IDIR_GDK_PIXBUF_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_GDK_PIXBUF_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
deleted file mode 100644
index c15e435..0000000
--- a/package/gettext/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME= gettext
-PKG_VERSION= 0.18.1.1
-PKG_RELEASE= 2
-PKG_MD5SUM:= 3dd55b952826d2b32f51308f2f91aa89
-PKG_DESCR:= internationalisation library
-PKG_SECTION:= libs
-PKG_BUILDDEP:= libiconv
-PKG_DEPENDS:= libiconv libpthread
-PKG_URL:= http://www.gnu.org/software/gettext/
-PKG_SITES:= ${MASTER_SITE_GNU:=gettext/}
-
-PKG_SUBPKGS:= LIBINTL LIBINTL_DEV GETTEXT MSGFMT
-PKGSD_LIBINTL_DEV:= libintl headers
-PKGSC_LIBINTL_DEV:= devel
-PKGSD_GETTEXT:= gettext utility
-PKGSC_GETTEXT:= misc
-PKGSS_GETTEXT:= libintl
-PKGSD_MSGFMT:= msgfmt utility
-PKGSC_MSGFMT:= misc
-PKGSS_MSGFMT:= libintl
-
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
-endif
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBINTL,libintl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBINTL_DEV,libintl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBINTL_DEV},${PKGSC_LIBINTL_DEV},${PKG_OPTS}))
-$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GETTEXT},${PKGSD_GETTEXT},${PKGSC_GETTEXT}))
-$(eval $(call PKG_template,MSGFMT,msgfmt,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MSGFMT},${PKGSD_MSGFMT},${PKGSC_MSGFMT}))
-
-CONFIGURE_ARGS+= --disable-java \
- --disable-native-java \
- --disable-csharp \
- --disable-libasprintf \
- --disable-rpath \
- --enable-threads=posix \
- --enable-nls \
- --disable-openmp \
- --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \
- --with-included-gettext \
- --without-emacs
-CONFIGURE_ENV+= nls_cv_use_gnu_gettext=yes \
- ac_cv_gnu_library_2=no \
- gt_use_preinstalled_gnugettext=no
-
-INSTALL_STYLE:= manual
-
-post-build:
- ${INSTALL_DIR} ${STAGING_DIR}/usr/include ${STAGING_DIR}/usr/lib
- $(CP) $(WRKBUILD)/gettext-runtime/intl/libintl.h ${STAGING_DIR}/usr/include
- ${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \
- ${STAGING_DIR}/usr/lib
-
-do-install:
- ${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib
- ${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \
- ${IDIR_LIBINTL}/usr/lib
- ${INSTALL_DIR} ${IDIR_LIBINTL_DEV}/usr/include
- ${INSTALL_DATA} ${WRKBUILD}/gettext-runtime/intl/libintl.h \
- ${IDIR_LIBINTL_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin
- $(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/xgettext \
- $(IDIR_GETTEXT)/usr/bin
- $(INSTALL_BIN) $(WRKBUILD)/gettext-runtime/src/.libs/gettext \
- $(IDIR_GETTEXT)/usr/bin
- ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/bin
- ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/lib
- ${CP} ${WRKBUILD}/gettext-tools/libgettextpo/.libs/libgettextpo.so* \
- ${IDIR_MSGFMT}/usr/lib
- ${CP} ${WRKBUILD}/gettext-tools/gnulib-lib/.libs/libgettextlib*so* \
- ${IDIR_MSGFMT}/usr/lib
- ${CP} ${WRKBUILD}/gettext-tools/src/.libs/libgettextsrc*so* \
- ${IDIR_MSGFMT}/usr/lib
- $(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgfmt \
- $(IDIR_MSGFMT)/usr/bin
- $(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgmerge \
- $(IDIR_MSGFMT)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gettext/patches/patch-build-aux_ltmain_sh b/package/gettext/patches/patch-build-aux_ltmain_sh
deleted file mode 100644
index e8284a6..0000000
--- a/package/gettext/patches/patch-build-aux_ltmain_sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- gettext-0.18.1.1.orig/build-aux/ltmain.sh 2010-06-06 14:49:57.000000000 +0200
-+++ gettext-0.18.1.1/build-aux/ltmain.sh 2011-01-14 12:26:11.000000000 +0100
-@@ -4901,7 +4901,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
-@@ -5652,27 +5652,6 @@ func_mode_link ()
- esac
- fi
-
-- # Hardcode the library path.
-- # Skip directories that are in the system default run-time
-- # search path.
-- case " $sys_lib_dlsearch_path " in
-- *" $absdir "*) ;;
-- *)
-- case "$compile_rpath " in
-- *" $absdir "*) ;;
-- *) compile_rpath="$compile_rpath $absdir"
-- esac
-- ;;
-- esac
-- case " $sys_lib_dlsearch_path " in
-- *" $libdir "*) ;;
-- *)
-- case "$finalize_rpath " in
-- *" $libdir "*) ;;
-- *) finalize_rpath="$finalize_rpath $libdir"
-- esac
-- ;;
-- esac
- fi # $linkmode,$pass = prog,link...
-
- if test "$alldeplibs" = yes &&
diff --git a/package/gettext/patches/patch-gettext-runtime_gnulib-lib_stdio_in_h b/package/gettext/patches/patch-gettext-runtime_gnulib-lib_stdio_in_h
deleted file mode 100644
index eb57620..0000000
--- a/package/gettext/patches/patch-gettext-runtime_gnulib-lib_stdio_in_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 21:56:12.000000000 +0200
-+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-07-31 11:28:12.000000000 +0200
-@@ -141,7 +141,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h b/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h
deleted file mode 100644
index f329c1e..0000000
--- a/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/libxml/xmlversion.in.h 2010-06-06 14:49:58.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/libxml/xmlversion.in.h 2011-10-17 03:58:30.336558512 +0200
-@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
- *
- * Whether iconv support is available
- */
--#if 1
-+#if 0
- #define LIBXML_ICONV_ENABLED
- #endif
-
diff --git a/package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h b/package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h
deleted file mode 100644
index 4497be8..0000000
--- a/package/gettext/patches/patch-gettext-tools_gnulib-lib_spawn_in_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/spawn.in.h 2010-05-24 11:42:46.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h 2011-02-04 19:21:02.000000000 +0100
-@@ -31,7 +31,7 @@
-
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
- But avoid namespace pollution on glibc systems. */
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) || defined(__UCLIBC__)
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/package/gettext/patches/patch-gettext-tools_gnulib-lib_stdio_in_h b/package/gettext/patches/patch-gettext-tools_gnulib-lib_stdio_in_h
deleted file mode 100644
index 5bcb982..0000000
--- a/package/gettext/patches/patch-gettext-tools_gnulib-lib_stdio_in_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2010-05-24 11:42:46.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-07-31 11:29:05.000000000 +0200
-@@ -141,7 +141,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/package/gettext/patches/patch-gettext-tools_libgettextpo_stdio_in_h b/package/gettext/patches/patch-gettext-tools_libgettextpo_stdio_in_h
deleted file mode 100644
index fd37020..0000000
--- a/package/gettext/patches/patch-gettext-tools_libgettextpo_stdio_in_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 21:58:03.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-07-31 11:31:22.000000000 +0200
-@@ -141,7 +141,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/package/giblib/Makefile b/package/giblib/Makefile
index 70743c3..e972f8e 100644
--- a/package/giblib/Makefile
+++ b/package/giblib/Makefile
@@ -5,17 +5,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= giblib
PKG_VERSION:= 1.2.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c810ef5389baf24882a1caca2954385e
PKG_DESCR:= imlib2 wrapper library
PKG_SECTION:= libs
PKG_DEPENDS:= imlib2
PKG_BUILDDEP:= imlib2
PKG_SITES:= http://linuxbrit.co.uk/downloads/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GIBLIB,giblib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GIBLIB,giblib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
giblib-install:
$(INSTALL_DIR) $(IDIR_GIBLIB)/usr/lib
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
index dd3c02a..c6dd83e 100644
--- a/package/giflib/Makefile
+++ b/package/giflib/Makefile
@@ -5,28 +5,22 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= giflib
PKG_VERSION:= 4.1.6
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 4ff2ecec336b9724c5190f06e8a40f9e
PKG_DESCR:= GIF graphics library
PKG_SECTION:= libs
PKG_URL:= http://sourceforge.net/projects/giflib/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
+PKG_OPTS:= dev
-PKG_SUBPKGS:= GIFLIB GIFLIB_DEV
-PKGSC_GIFLIB_DEV:= devel
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GIFLIB_DEV,giflib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GIFLIB_DEV}))
+$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
giflib-install:
$(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib
$(CP) $(WRKINST)/usr/lib/libgif.so* \
$(IDIR_GIFLIB)/usr/lib
-giflib-dev-install:
- ${INSTALL_DIR} ${IDIR_GIFLIB_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_GIFLIB_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glib/Makefile b/package/glib/Makefile
index d3e1a29..732f2bc 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= glib
PKG_VERSION:= 2.28.1
PKG_EXTRAVER:= 2.28
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
@@ -15,21 +15,17 @@ PKG_BUILDDEP:= gettext-tiny libiconv dbus
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
+PKG_OPTS:= dev
#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-PKG_SUBPKGS:= GLIB GLIB_DEV
-PKGSC_GLIB_DEV:= devel
-PKGSD_GLIB_DEV:= glib headers
-
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,GLIB_DEV,glib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLIB_DEV},${PKGSC_GLIB_DEV},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --enable-debug=no \
@@ -66,8 +62,7 @@ glib-install:
${CP} ${WRKINST}/usr/lib/libgobject*.so* ${IDIR_GLIB}/usr/lib
${CP} ${WRKINST}/usr/lib/libgmodule*.so* ${IDIR_GLIB}/usr/lib
${CP} ${WRKINST}/usr/lib/libgthread*.so* ${IDIR_GLIB}/usr/lib
-
-glib-dev-install:
+ # workaround for dev subpackage
${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/include
${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include
${CP} ${WRKINST}/usr/lib/glib-2.0/include/glibconfig.h \
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual
index dd5ab41..5e5bd1d 100644
--- a/package/glibc/Config.in.manual
+++ b/package/glibc/Config.in.manual
@@ -7,13 +7,3 @@ config ADK_PACKAGE_GLIBC
select ADK_PACKAGE_TZDATA
help
GNU C library.
-
-config ADK_PACKAGE_GLIBC_DEV
- prompt "glibc-dev................ development files"
- tristate
- default n
- depends on ADK_TARGET_LIB_GLIBC
- help
- GNU C library header files.
-
-
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index a03a5c8..d6f0f21 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -29,16 +29,6 @@ INSTALL_STYLE:= manual
# compile nothing, glibc is already build in toolchain directory
do-install:
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
- for abi in $(TABI); do \
- ${INSTALL_DIR} $(IDIR_GLIBC)/lib$${abi/*:/} $(IDIR_GLIBC)/usr/lib$${abi/*:/} ; \
- $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_GLIBC)/lib$${abi/*:/} ; \
- -for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \
- $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file.so* $(IDIR_GLIBC)/lib$${abi/*:/}; \
- $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib$${abi/*:/}; \
- done ; \
- done
-else
${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH)
$(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH)
for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \
@@ -50,7 +40,6 @@ else
ifeq ($(ADK_LOCALES),y)
$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_GLIBC)/usr/bin
endif
-endif
${INSTALL_DIR} ${IDIR_GLIBC}/etc
${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc
${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_GLIBC}/etc
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
index 6c6aa68..6c3e5e7 100644
--- a/package/glproto/Makefile
+++ b/package/glproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= glproto
PKG_VERSION:= 1.4.15
PKG_RELEASE:= 1
PKG_DESCR:= OpenGL headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= be7c4e3c289db480b9e1238c03637eb7
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GLPROTO,glproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_GLPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/GL ${IDIR_GLPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_GLPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/glproto.pc \
- ${IDIR_GLPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index b9c627c..a540491 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -4,25 +4,19 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gmp/Makefile.inc
+PKG_NAME:= gmp
PKG_DESCR:= GNU multiprecision arithmetic library
PKG_SECTION:= libs
PKG_URL:= http://gmplib.org/
-
-PKG_SUBPKGS:= LIBGMP LIBGMP_DEV
-PKGSC_LIBGMP_DEV:= devel
-PKGSD_LIBGMP_DEV:= libgmp headers
+PKG_LIBNAME:= libgmp
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGMP_DEV,libgmp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGMP_DEV},${PKGSC_LIBGMP_DEV}))
+$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libgmp-install:
${INSTALL_DIR} ${IDIR_LIBGMP}/usr/lib
${CP} ${WRKINST}/usr/lib/libgmp.so* ${IDIR_LIBGMP}/usr/lib
-libgmp-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBGMP_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGMP_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index a974995..028b765 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -16,21 +16,18 @@ PKG_BUILDDEP+= gdk-pixbuf libXcomposite libXdamage
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/
PKG_NEED_CXX:= 1
-
-PKG_SUBPKGS:= LIBGTK LIBGTK_DEV
-PKGSC_LIBGTK_DEV:= devel
-PKGSD_LIBGTK_DEV:= GTK+ headers
+PKG_LIBNAME:= libgtk
+PKG_OPTS:= dev
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGTK_DEV,libgtk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGTK_DEV},${PKGSC_LIBGTK_DEV},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-gtk-doc-html \
--disable-modules \
@@ -48,14 +45,9 @@ libgtk-install:
${CP} ${WRKINST}/usr/lib/libgdk-x11*so* ${IDIR_LIBGTK}/usr/lib
${CP} ${WRKINST}/usr/lib/libgtk-x11*so* ${IDIR_LIBGTK}/usr/lib
${CP} ${WRKINST}/usr/lib/libgailutil*so* ${IDIR_LIBGTK}/usr/lib
-
-libgtk-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGTK_DEV}/usr/include
+ # workaround dev subpackage
${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
${CP} ${WRKINST}/usr/lib/gtk-2.0/include/* \
${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
- ${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index 6c1b27b..42743b4 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= inputproto
PKG_VERSION:= 2.2
PKG_RELEASE:= 1
PKG_DESCR:= X Input Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= e0047823230413e67d74e92af77fbe58
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_INPUTPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_INPUTPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_INPUTPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/inputproto.pc \
- ${IDIR_INPUTPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 8557c0e..a76a77c 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= iptables
PKG_VERSION:= 1.4.20
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 387b92d3efcf4f07fe31c3bf0f1d18f5
PKG_DESCR:= The netfilter firewalling software
PKG_SECTION:= firewall
@@ -18,9 +18,7 @@ PKG_DEPENDS+= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6
PKG_DEPENDS+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject
PKG_URL:= http://www.netfilter.org/
PKG_SITES:= http://www.netfilter.org/projects/iptables/files/
-
-PKG_SUBPKGS:= IPTABLES IPTABLES_DEV
-PKGSC_IPTABLES_DEV:= devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -30,8 +28,7 @@ include ${TOPDIR}/mk/package.mk
# use --disable-static in CONFIGURE_ARGS to change and optimize package
#include ${LINUX_DIR}/.config
-$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKGSC_IPTABLES_DEV}))
+$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -fPIC
CONFIGURE_ARGS+= --enable-devel
@@ -49,8 +46,4 @@ iptables-install:
${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin
${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib
-iptables-dev-install:
- ${INSTALL_DIR} ${IDIR_IPTABLES_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_IPTABLES_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile
index 6354371..04eed7b 100644
--- a/package/jpeg/Makefile
+++ b/package/jpeg/Makefile
@@ -5,34 +5,26 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= jpeg
PKG_VERSION:= 8d
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 52654eb3b2e60c35731ea8fc87f1bd29
PKG_DESCR:= The Independent JPEG Groups JPEG runtime library
PKG_SECTION:= libs
PKG_URL:= http://www.ijg.org/
PKG_SITES:= http://www.ijg.org/files/
-
-PKG_SUBPKGS:= LIBJPEG LIBJPEG_DEV
-PKGSD_LIBJPEG_DEV:= development files for libjpeg
-PKGSC_LIBJPEG_DEV:= devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBJPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBJPEG_DEV},${PKGSC_LIBJPEG_DEV}))
libjpeg-install:
${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib
${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/
-libjpeg-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBJPEG_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBJPEG_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index 9a06302..2021096 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= kbproto
PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
PKG_DESCR:= X11 keyboard protocol headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 9c650b7947fe59b3f144518400e8d029
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_KBPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_KBPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_KBPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/kbproto.pc \
- ${IDIR_KBPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 268385b..21aa9b8 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= krb5
PKG_VERSION:= 1.11.3
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 56f0ae274b285320b8a597cb89442449
PKG_DESCR:= MIT kerberos server
PKG_SECTION:= crypto
@@ -15,12 +15,12 @@ PKG_BUILDDEP:= ncurses e2fsprogs gettext-tiny
PKG_URL:= http://web.mit.edu/kerberos/
PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.11/
PKG_NOPARALLEL:= 1
+PKG_LIBNAME:= libkrb5
+PKG_OPTS:= dev
-PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT KRB5_UTIL LIBKRB5 LIBKRB5_DEV
+PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT KRB5_UTIL LIBKRB5
PKGSD_LIBKRB5:= MIT kerberos libraries
PKGSC_LIBKRB5:= libs
-PKGSD_LIBKRB5_DEV:= MIT kerberos headers
-PKGSC_LIBKRB5_DEV:= devel
PKGSD_KRB5_CLIENT:= MIT kerberos client tools
PKGSC_KRB5_CLIENT:= crypto
PKGSS_KRB5_CLIENT:= libkrb5 libncurses libss libcom-err
@@ -40,8 +40,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,KRB5_CLIENT,krb5-client,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_CLIENT},${PKGSD_KRB5_CLIENT},${PKGSC_KRB5_CLIENT}))
$(eval $(call PKG_template,KRB5_UTIL,krb5-util,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_UTIL},${PKGSD_KRB5_UTIL},${PKGSC_KRB5_UTIL}))
-$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5}))
-$(eval $(call PKG_template,LIBKRB5_DEV,libkrb5-dev,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5_DEV},${PKGSC_LIBKRB5_DEV}))
+$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-static \
--disable-profiled \
@@ -96,12 +95,4 @@ libkrb5-install:
echo '/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init' \
> ${IDIR_LIBKRB5}/etc/gssapi_mech.conf
-libkrb5-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBKRB5_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/krb5-config \
- ${IDIR_LIBKRB5_DEV}/usr/bin
- ${INSTALL_DIR} ${IDIR_LIBKRB5_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBKRB5_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index dc7860a..1c9f626 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libICE
PKG_VERSION:= 1.0.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 4b8dae73fce37e994c3a6fa05d6db7ca
PKG_DESCR:= Inter-Client Exchange library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xtrans xproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBICE LIBICE_DEV
-PKGSD_LIBICE_DEV:= Inter-Client Exchange headers
-PKGSC_LIBICE_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBICE_DEV,libice-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBICE_DEV},${PKGSC_LIBICE_DEV}))
+$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -27,11 +23,4 @@ libice-install:
${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib
${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib
-libice-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBICE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBICE_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBICE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBICE_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index d5f0136..aae9668 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libIDL
PKG_VERSION:= 0.8.14
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 531fbc1b40b80dd1d6f3b5e76b99067c
PKG_DESCR:= libraries for Interface Definition Language files
PKG_SECTION:= libs
@@ -13,32 +13,17 @@ PKG_DEPENDS:= glib
PKG_BUILDDEP:= glib
PKG_URL:= http://www.gnome.org/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
-
-PKG_SUBPKGS:= LIBIDL LIBIDL_DEV
-PKGSD_LIBIDL_DEV:= libidl headers
-PKGSC_LIBIDL_DEV:= devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
CONFIGURE_ENV+= libIDL_cv_long_long_format=ll
-$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBIDL_DEV,libidl-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIDL_DEV},${PKGSC_LIBIDL_DEV}))
+$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libidl-install:
$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
$(CP) $(WRKINST)/usr/lib/libIDL*.so* \
$(IDIR_LIBIDL)/usr/lib
-libidl-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBIDL_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/libIDL-config-2 \
- $(IDIR_LIBIDL_DEV)/usr/bin
- $(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index a2e8c46..b10c500 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -5,32 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libSM
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1d507651e9fa50aab7ef11be9e0e2f20
PKG_DESCR:= X11 Session Management library
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libuuid
PKG_BUILDDEP:= libICE util-linux
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBSM LIBSM_DEV
-PKGSD_LIBSM_DEV:= X11 Session Management headers
-PKGSC_LIBSM_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSM_DEV,libsm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSM_DEV},${PKGSC_LIBSM_DEV}))
+$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libsm-install:
${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib
${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib
-libsm-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBSM_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBSM_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBSM_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBSM_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index beabb32..3a27d72 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libX11
PKG_VERSION:= 1.5.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 395455e4d3a51459374fe5ca8420aae8
PKG_DESCR:= X11 client-side library
PKG_SECTION:= x11/libs
@@ -13,19 +13,15 @@ PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau xcb-proto
PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto libxcb
PKG_DEPENDS:= libxdmcp libxcb libxau
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBX11 LIBX11_DEV
-PKGSD_LIBX11_DEV:= X11 headers
-PKGSC_LIBX11_DEV:= x11/devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-xlocale \
--disable-specs \
@@ -39,11 +35,4 @@ libx11-install:
${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
-libx11-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
- ${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11
- ${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBX11_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile
index 675a67f..1d36524 100644
--- a/package/libXScrnSaver/Makefile
+++ b/package/libXScrnSaver/Makefile
@@ -5,21 +5,22 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXScrnSaver
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8e459e544298caa27fc7c7e5a56e2a6d
PKG_DESCR:= X.Org XScrnSaver library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= scrnsaverproto libXext
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXSCRNSAVER,libxscrnsaver,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXSCRNSAVER,libxscrnsaver,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-malloc0returnsnull
-post-install:
+libxscrnsaver-install:
$(INSTALL_DIR) $(IDIR_LIBXSCRNSAVER)/usr/lib
${CP} $(WRKINST)/usr/lib/libXss.so* \
$(IDIR_LIBXSCRNSAVER)/usr/lib/
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index 7ef1f8f..b4633de 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -5,36 +5,24 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXau
PKG_VERSION:= 1.0.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 3ab7a4d1aac1b7f8ccc6b9755a19f252
PKG_DESCR:= X11 authorisation library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXAU LIBXAU_DEV
-PKGSD_LIBXAU_DEV:= Xauth headers
-PKGSC_LIBXAU_DEV:= x11/devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXAU_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS}))
-post-install:
+libxau-install:
${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/
-libxau-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXAU_DEV}/usr/include/X11/
- ${CP} ${WRKINST}/usr/include/X11/* \
- ${IDIR_LIBXAU_DEV}/usr/include/X11/
- ${INSTALL_DIR} ${IDIR_LIBXAU_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xau.pc \
- ${IDIR_LIBXAU_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 67e7482..65d3f96 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -5,28 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXaw
PKG_VERSION:= 1.0.11
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c487a810a8a9b0eb5091f382790b4e75
PKG_DESCR:= X11 Athena Widget library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext libXmu libXpm
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXAW LIBXAW_DEV
-PKGSC_LIBXAW_DEV:= x11/devel
-PKGSD_LIBXAW_DEV:= X11 Athena Widget headers
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXAW_DEV,libxaw-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAW_DEV},${PKGSC_LIBXAW_DEV}))
+$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxaw-install:
${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib
${CP} ${WRKINST}/usr/lib/libXaw*.so* ${IDIR_LIBXAW}/usr/lib
-libxaw-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXAW_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXAW_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile
index e0bd7d1..4ca0500 100644
--- a/package/libXcomposite/Makefile
+++ b/package/libXcomposite/Makefile
@@ -5,36 +5,24 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXcomposite
PKG_VERSION:= 0.4.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b93dac50c86db6eba3f72e949f5bed2a
PKG_DESCR:= X composite library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 compositeproto libXfixes
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXCOMPOSITE LIBXCOMPOSITE_DEV
-PKGSD_LIBXCOMPOSITE_DEV:= X11 composite headers
-PKGSC_LIBXCOMPOSITE_DEV:= x11/devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXCOMPOSITE_DEV,libxcomposite-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXCOMPOSITE_DEV},${PKGSC_LIBXCOMPOSITE_DEV},${PKG_OPTS}))
libxcomposite-install:
${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib
${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/
-libxcomposite-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXCOMPOSITE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE_DEV}/usr/include/X11/extensions
- ${CP} ${WRKINST}/usr/include/X11/extensions/*.h \
- ${IDIR_LIBXCOMPOSITE_DEV}/usr/include/X11/extensions
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXcursor/Makefile b/package/libXcursor/Makefile
index b007823..286f5bf 100644
--- a/package/libXcursor/Makefile
+++ b/package/libXcursor/Makefile
@@ -5,33 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXcursor
PKG_VERSION:= 1.1.13
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 38a6c7ce393cb5bc10e67de087f9d582
PKG_DESCR:= xcursor library
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_BUILDDEP:= libXfixes libXrender
-
-PKG_SUBPKGS:= LIBXCURSOR LIBXCURSOR_DEV
-PKGSC_LIBXCURSOR_DEV:= x11/devel
-PKGSD_LIBXCURSOR_DEV:= libXcursor development files
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXCURSOR,libxcursor,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXCURSOR_DEV,libxcursor-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXCURSOR,libxcursor,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxcursor-install:
$(INSTALL_DIR) $(IDIR_LIBXCURSOR)/usr/lib
$(CP) $(WRKINST)/usr/lib/libXcursor*.so* \
$(IDIR_LIBXCURSOR)/usr/lib
-libxcursor-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBXCURSOR_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBXCURSOR_DEV)/usr/lib/pkgconfig
- $(INSTALL_DIR) $(IDIR_LIBXCURSOR_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBXCURSOR_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
index 7898986..c301fc9 100644
--- a/package/libXdamage/Makefile
+++ b/package/libXdamage/Makefile
@@ -5,33 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXdamage
PKG_VERSION:= 1.1.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 5e54789fd1c56392d38d29c6b8dad142
PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXfixes damageproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXDAMAGE LIBXDAMAGE_DEV
-PKGSC_LIBXDAMAGE_DEV:= x11/devel
-PKGSD_LIBXDAMAGE_DEV:= DAMAGE extension headers
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXDAMAGE_DEV,libxdamage-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDAMAGE_DEV},${PKGSC_LIBXDAMAGE_DEV}))
+$(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxdamage-install:
$(INSTALL_DIR) $(IDIR_LIBXDAMAGE)/usr/lib
$(CP) $(WRKINST)/usr/lib/libXdamage*.so* \
$(IDIR_LIBXDAMAGE)/usr/lib
-libxdamage-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBXDAMAGE_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBXDAMAGE_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBXDAMAGE_DEV)/usr/lib/pkgconfig
- $(INSTALL_DATA) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBXDAMAGE_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index 0bde786..1e27317 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -5,37 +5,24 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXdmcp
PKG_VERSION:= 1.1.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 194f30d2bb67b23dc33351e128db40a9
PKG_DESCR:= X11 display manager control protocol library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXDMCP LIBXDMCP_DEV
-PKGSB_LIBXDMCP:= xproto
-PKGSD_LIBXDMCP_DEV:= XDMCP headers
-PKGSC_LIBXDMCP_DEV:= x11/devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS}))
libxdmcp-install:
${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib
${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib
-libxdmcp-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/include/X11
- ${CP} ${WRKINST}/usr/include/X11/* \
- ${IDIR_LIBXDMCP_DEV}/usr/include/X11
- ${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXDMCP_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 25760a9..2713ecb 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -5,26 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXext
PKG_VERSION:= 1.3.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 249478eae5c4fab7722894cb99565405
PKG_DESCR:= X client interface to extensions of the X protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 xextproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXEXT LIBXEXT_DEV
-PKGSD_LIBXEXT_DEV:= X11 extension headers
-PKGSC_LIBXEXT_DEV:= x11/devel
-PKGSS_LIBXEXT_DEV:= xextproto
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXEXT_DEV},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -32,12 +27,4 @@ libxext-install:
${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
-libxext-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
- ${CP} ${WRKINST}/usr/include/X11/extensions/*.h \
- ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
- ${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xext.pc \
- ${IDIR_LIBXEXT_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
index 96c0c82..99c61af 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -5,34 +5,22 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXfixes
PKG_VERSION:= 5.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 0a2139e91df4758218e0fddbd549e13c
PKG_DESCR:= X Fixes Library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= fixesproto xextproto xproto libX11
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXFIXES LIBXFIXES_DEV
-PKGSC_LIBXFIXES_DEV:= x11/devel
-PKGSD_LIBXFIXES_DEV:= X Fixes headers
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXFIXES_DEV,libxfixes-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFIXES_DEV},${PKGSC_LIBXFIXES_DEV}))
+$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxfixes-install:
$(INSTALL_DIR) $(IDIR_LIBXFIXES)/usr/lib
$(CP) $(WRKINST)/usr/lib/libXfixes*.so* \
$(IDIR_LIBXFIXES)/usr/lib
-libxfixes-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBXFIXES_DEV)/usr/include/X11/extensions
- $(CP) $(WRKINST)/usr/include/X11/extensions/Xfixes.h \
- $(IDIR_LIBXFIXES_DEV)/usr/include/X11/extensions
- $(INSTALL_DIR) $(IDIR_LIBXFIXES_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/xfixes.pc \
- $(IDIR_LIBXFIXES_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 10bd5c9..52a35c7 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -5,22 +5,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXfont
PKG_VERSION:= 1.4.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a54dea0debecf232a346c22e71d76836
PKG_DESCR:= X font Library
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libfreetype
PKG_BUILDDEP:= freetype fontcacheproto fontsproto libfontenc xtrans
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXFONT LIBXFONT_DEV
-PKGSD_LIBXFONT_DEV:= X font headers
-PKGSC_LIBXFONT_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXFONT_DEV,libxfont-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFONT_DEV},${PKGSC_LIBXFONT_DEV}))
+$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= ac_cv_path_XMLTO=true
@@ -28,12 +24,4 @@ libxfont-install:
${INSTALL_DIR} ${IDIR_LIBXFONT}/usr/lib
${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib
-libxfont-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBXFONT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xfont.pc \
- ${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 9a3cb5a..100b9e3 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXft
PKG_VERSION:= 2.3.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 946a157090eec5c3041cf17530d93f59
PKG_DESCR:= X FreeType library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXrender fontconfig
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXFT LIBXFT_DEV
-PKGSD_LIBXFT_DEV:= X FreeType headers
-PKGSC_LIBXFT_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXFT_DEV,libxft-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFT_DEV},${PKGSC_LIBXFT_DEV}))
+$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -27,11 +23,4 @@ libxft-install:
${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib
${CP} ${WRKINST}/usr/lib/libXft.so* ${IDIR_LIBXFT}/usr/lib
-libxft-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXFT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
- $(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 54ddb1f..132317e 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -5,37 +5,28 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXi
PKG_VERSION:= 1.6.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= d024a9de73191628f9772893f02054d8
PKG_DESCR:= X Window System client interface to the XINPUT extension to the X protocol.
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto xextproto libXext
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXI LIBXI_DEV
-PKGSS_LIBXI_DEV:= inputproto
-PKGSC_LIBXI_DEV:= x11/devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
-$(eval $(call PKG_template,LIBXI_DEV,libxi-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXI_DEV},${PKG_DESCR},${PKGSC_LIBXI_DEV},$(PKG_OPTS)))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
-post-install:
+libxi-install:
$(INSTALL_DIR) $(IDIR_LIBXI)/usr/lib
$(CP) $(WRKINST)/usr/lib/libXi*.so* \
$(IDIR_LIBXI)/usr/lib
-libxi-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBXI_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBXI_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile
index 2a6f7d7..2f7e2f8 100644
--- a/package/libXinerama/Makefile
+++ b/package/libXinerama/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXinerama
PKG_VERSION:= 1.1.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 29a813b3850d499a3524a8d5d5ecb099
PKG_DESCR:= Xinerama library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xineramaproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXINERAMA LIBXINERAMA_DEV
-PKGSD_LIBXINERAMA_DEV:= Xinerama headers
-PKGSC_LIBXINERAMA_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXINERAMA_DEV,libxinerama-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXINERAMA_DEV},${PKGSC_LIBXINERAMA_DEV}))
+$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -27,11 +23,4 @@ libxinerama-install:
${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib
${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib
-libxinerama-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXINERAMA_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index 8d6483d..50a8089 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -5,32 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXmu
PKG_VERSION:= 1.1.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 53fd02bc7174dd643a26bcc88147c146
PKG_DESCR:= miscellaneous utility functions for X libraries
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXt libXext
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXMU LIBXMU_DEV
-PKGSD_LIBXMU_DEV:= X miscellaneous utility function headers
-PKGSC_LIBXMU_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXMU_DEV,libxmu-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxmu-install:
${INSTALL_DIR} ${IDIR_LIBXMU}/usr/lib
${CP} ${WRKINST}/usr/lib/libXmu.so* ${IDIR_LIBXMU}/usr/lib
${CP} ${WRKINST}/usr/lib/libXmuu.so* ${IDIR_LIBXMU}/usr/lib
-libxmu-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXMU_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXMU_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXMU_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXMU_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXp/Makefile b/package/libXp/Makefile
index 9682b4f..343b443 100644
--- a/package/libXp/Makefile
+++ b/package/libXp/Makefile
@@ -5,30 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXp
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a960c831f11e6b4249fde78a5b969000
PKG_DESCR:= X Print library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext printproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXP LIBXP_DEV
-PKGSD_LIBXP_DEV:= X Print headers
-PKGSC_LIBXP_DEV:= x11/devel
-PKGSS_LIBXP_DEV:= printproto
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXP,libxp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXP_DEV,libxp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXP_DEV},${PKGSC_LIBXP_DEV}))
+$(eval $(call PKG_template,LIBXP,libxp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxp-install:
${INSTALL_DIR} ${IDIR_LIBXP}/usr/lib
${CP} ${WRKINST}/usr/lib/libXp.so* ${IDIR_LIBXP}/usr/lib
-libxp-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKBUILD}/*.pc \
- ${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index c9ac44b..49cd986 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXpm
PKG_VERSION:= 3.5.10
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a70507638d74541bf30a771f1e5938bb
PKG_DESCR:= common operation for the XPM pixmap format
PKG_BUILDDEP:= libX11 libXt
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXPM LIBXPM_DEV
-PKGSD_LIBXPM_DEV:= XPM pixmap format headers
-PKGSC_LIBXPM_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXPM_DEV,libxpm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXPM_DEV},${PKGSC_LIBXPM_DEV}))
+$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= ac_cv_search_gettext=no
@@ -27,11 +23,4 @@ libxpm-install:
${INSTALL_DIR} ${IDIR_LIBXPM}/usr/lib
${CP} ${WRKINST}/usr/lib/libXpm.so* ${IDIR_LIBXPM}/usr/lib
-libxpm-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXPM_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXPM_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXPM_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXPM_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile
index e773b8f..25ba700 100644
--- a/package/libXrandr/Makefile
+++ b/package/libXrandr/Makefile
@@ -5,21 +5,16 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXrandr
PKG_VERSION:= 1.3.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= edacf83655be2e48348b626c0dc454f3
PKG_DESCR:= Xrandr library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= randrproto
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:= LIBXRANDR LIBXRANDR_DEV
-PKGSD_LIBXRANDR_DEV:= Xrandr headers
-PKGSC_LIBXRANDR_DEV:= x11/devel
-
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXRANDR,libxrandr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXRANDR_DEV,libxrandr-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXRANDR_DEV},${PKGSC_LIBXRANDR_DEV}))
+$(eval $(call PKG_template,LIBXRANDR,libxrandr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -27,11 +22,4 @@ libxrandr-install:
${INSTALL_DIR} ${IDIR_LIBXRANDR}/usr/lib
${CP} ${WRKINST}/usr/lib/libXrandr.so* ${IDIR_LIBXRANDR}/usr/lib
-libxrandr-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXRANDR_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXRANDR_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXRANDR_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXRANDR_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 516645c..5cc8414 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -5,25 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXrender
PKG_VERSION:= 0.9.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b6702e6f56f9d9103dc688f4336529a9
PKG_DESCR:= X11 rendering library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= renderproto libX11
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXRENDER LIBXRENDER_DEV
-PKGSD_LIBXRENDER_DEV:= X11 rendering headers
-PKGSC_LIBXRENDER_DEV:= x11/devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXRENDER_DEV,libxrender-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXRENDER_DEV},${PKGSC_LIBXRENDER_DEV},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -31,11 +27,4 @@ libxrender-install:
${INSTALL_DIR} ${IDIR_LIBXRENDER}/usr/lib
${CP} ${WRKINST}/usr/lib/libXrender.so* ${IDIR_LIBXRENDER}/usr/lib
-libxrender-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXRENDER_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXRENDER_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXRENDER_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xrender.pc \
- ${IDIR_LIBXRENDER_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 7f5004c..6d21536 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -5,22 +5,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXt
PKG_VERSION:= 1.1.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1
PKG_DESCR:= X Toolkit Intrinsics libraries
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb
PKG_BUILDDEP:= libSM libX11 kbproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXT LIBXT_DEV
-PKGSD_LIBXT_DEV:= X Toolkit Intrinsics headers
-PKGSC_LIBXT_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV}))
+$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -29,11 +25,4 @@ libxt-install:
${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib
${CP} ${WRKINST}/usr/lib/libXt.so* ${IDIR_LIBXT}/usr/lib
-libxt-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXT_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXT_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
index 1b288e8..760fdd2 100644
--- a/package/libXtst/Makefile
+++ b/package/libXtst/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXtst
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b
PKG_DESCR:= Xtst library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= recordproto libXi
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXTST LIBXTST_DEV
-PKGSD_LIBXTST_DEV:= Xtst headers
-PKGSC_LIBXTST_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXTST_DEV,libxtst-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXTST_DEV},${PKGSC_LIBXTST_DEV}))
+$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -27,11 +23,4 @@ libxtst-install:
${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib
${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib
-libxtst-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXTST_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index c17987b..5210223 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXv
PKG_VERSION:= 1.0.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 066145bab1f182476589af0ee9c18152
PKG_DESCR:= X11 Xvideo extensions library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 videoproto libXext
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXV LIBXV_DEV
-PKGSD_LIBXV_DEV:= X11 Xvideo extensions headers
-PKGSC_LIBXV_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXV_DEV,libxv-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXV_DEV},${PKGSC_LIBXV_DEV}))
+$(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -27,12 +23,4 @@ libxv-install:
${INSTALL_DIR} ${IDIR_LIBXV}/usr/lib
${CP} ${WRKINST}/usr/lib/libXv.so* ${IDIR_LIBXV}/usr/lib/
-libxv-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXV_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBXV_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXV_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXV_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index 8a179c1..9561b34 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -5,20 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXxf86dga
PKG_VERSION:= 1.1.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 3d58873171c7765956ce257e6a7e4865
PKG_DESCR:= client library for the XFree86-DGA extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86dgaproto libXext libXaw
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
-post-install:
+libxxf86dga-install:
${INSTALL_DIR} ${IDIR_LIBXXF86DGA}/usr/lib
${CP} ${WRKINST}/usr/lib/libXxf86dga.so* ${IDIR_LIBXXF86DGA}/usr/lib/
diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile
index 9587663..96f25af 100644
--- a/package/libXxf86vm/Makefile
+++ b/package/libXxf86vm/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXxf86vm
PKG_VERSION:= 1.1.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 84d26e26c07f8cbcb5f447590df5b5c3
PKG_DESCR:= an interface to the XFree86-VidModeExtension extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86vidmodeproto libXext
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXXF86VM LIBXXF86VM_DEV
-PKGSC_LIBXXF86VM_DEV:= devel
-PKSSD_LIBXXF86VM_DEV:= XFree86-VidModeExtension headers
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXXF86VM,libxxf86vm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXXF86VM_DEV,libxxf86vm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKSSD_LIBXXF86VM_DEV},${PKGSC_LIBXXF86VM_DEV}))
+$(eval $(call PKG_template,LIBXXF86VM,libxxf86vm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -28,12 +24,4 @@ libxxf86vm-install:
${CP} $(WRKINST)/usr/lib/libXxf86vm*.so* \
$(IDIR_LIBXXF86VM)/usr/lib
-libxxf86vm-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBXXF86VM_DEV)/usr/include
- ${CP} $(WRKINST)/usr/include/* \
- $(IDIR_LIBXXF86VM_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBXXF86VM_DEV)/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBXXF86VM_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libaio/Makefile b/package/libaio/Makefile
index b249d3b..4aed7b6 100644
--- a/package/libaio/Makefile
+++ b/package/libaio/Makefile
@@ -5,23 +5,23 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libaio
PKG_VERSION:= 0.3.109
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 435a5b16ca6198eaf01155263d855756
PKG_DESCR:= Asynchronous I/O library
PKG_SECTION:= libs
PKG_URL:= http://www.kernel.org
PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= x86 x86_64
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBAIO,libaio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAIO,libaio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= prefix='${WRKINST}/usr'
-
libaio-install:
$(INSTALL_DIR) $(IDIR_LIBAIO)/usr/lib
$(CP) $(WRKINST)/usr/lib/libaio*so* \
diff --git a/package/libantlr3c/Makefile b/package/libantlr3c/Makefile
index cb5d585..77a414f 100755
--- a/package/libantlr3c/Makefile
+++ b/package/libantlr3c/Makefile
@@ -5,15 +5,16 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libantlr3c
PKG_VERSION:= 3.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 674646e1d1bf5c6015435480cead725a
PKG_DESCR:= ANother Tool for Language Recognition
PKG_SECTION:= libs
PKG_SITES:= http://www.antlr.org/download/C/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBANTLR3C,libantlr3c,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBANTLR3C,libantlr3c,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= OPTIMFLAGS="$(TARGET_CFLAGS)"
diff --git a/package/libao/Makefile b/package/libao/Makefile
index effc7d5..dbe3f82 100644
--- a/package/libao/Makefile
+++ b/package/libao/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libao
PKG_VERSION:= 0.8.8
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= b92cba3cbcf1ee9bc221118a85d23dcd
PKG_DESCR:= A cross platform audio library
PKG_SECTION:= libs
@@ -13,17 +13,18 @@ PKG_DEPENDS:= esound
PKG_BUILDDEP:= esound
PKG_URL:= http://www.xiph.org/ao
PKG_SITES:= http://downloads.xiph.org/releases/ao/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBAO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-esd \
--disable-arts \
--disable-nas \
--disable-polyp
-post-install:
+libao-install:
${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib/ao/plugins-2
${CP} ${WRKINST}/usr/lib/libao.so* ${IDIR_LIBAO}/usr/lib/
${CP} ${WRKINST}/usr/lib/ao/plugins-2/*.so \
diff --git a/package/libart/Makefile b/package/libart/Makefile
index 92b0da0..bdc3250 100644
--- a/package/libart/Makefile
+++ b/package/libart/Makefile
@@ -5,22 +5,23 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libart
PKG_VERSION:= 2.3.17
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f1f6b3e5490f382535dccb288f5d8b14
PKG_DESCR:= An high-performance 2D graphics library
PKG_SECTION:= libs
PKG_SITES:= ${MASTER_SITE_GNOME:=libart_lgpl/2.3/}
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}_lgpl-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}_lgpl-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
MAKE_ENV+= HOSTCC=$(CC_FOR_BUILD)
-post-install:
+libart-install:
${INSTALL_DIR} ${IDIR_LIBART}/usr/lib
${CP} ${WRKINST}/usr/lib/libart_lgpl_2.so* ${IDIR_LIBART}/usr/lib/
diff --git a/package/libass/Makefile b/package/libass/Makefile
index 0443550..fc71399 100644
--- a/package/libass/Makefile
+++ b/package/libass/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libass
PKG_VERSION:= 0.10.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 0f54b1f3a24fa897ebbbcc5bc744b32a
PKG_DESCR:= a portable subtitle renderer for the ASS/SSA format
PKG_SECTION:= libs
@@ -13,12 +13,13 @@ PKG_DEPENDS:= fribidi fontconfig
PKG_BUILDDEP:= fribidi fontconfig
PKG_URL:= http://code.google.com/p/libass/
PKG_SITES:= http://libass.googlecode.com/files/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBASS,libass,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBASS,libass,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libass-install:
$(INSTALL_DIR) $(IDIR_LIBASS)/usr/lib
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile
index c8c514c..f71e11e 100644
--- a/package/libaudiofile/Makefile
+++ b/package/libaudiofile/Makefile
@@ -5,21 +5,18 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= audiofile
PKG_VERSION:= 0.2.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a39be317a7b1971b408805dc5e371862
PKG_DESCR:= audiofile library
PKG_SECTION:= libs
PKG_URL:= http://www.68k.org/~michael/audiofile/
PKG_SITES:= http://www.68k.org/~michael/audiofile/
-
-PKG_SUBPKGS:= LIBAUDIOFILE LIBAUDIOFILE_DEV
-PKGSC_LIBAUDIOFILE_DEV:=devel
-PKGSD_LIBAUDIOFILE_DEV:=audiofile headers
+PKG_LIBNAME:= libaudiofile
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAUDIOFILE_DEV,libaudiofile-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAUDIOFILE_DEV},${PKGSC_LIBAUDIOFILE_DEV}))
+$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= ac_cv_linux_vers=2
CONFIGURE_ARGS+= --with-build-cc=${CC_FOR_BUILD}
@@ -28,11 +25,4 @@ libaudiofile-install:
${INSTALL_DIR} ${IDIR_LIBAUDIOFILE}/usr/lib
${CP} ${WRKINST}/usr/lib/libaudiofile.so* ${IDIR_LIBAUDIOFILE}/usr/lib/
-libaudiofile-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBAUDIOFILE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBAUDIOFILE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_LIBAUDIOFILE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBAUDIOFILE_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libavl/Makefile b/package/libavl/Makefile
index d060dc0..2ac4045 100755
--- a/package/libavl/Makefile
+++ b/package/libavl/Makefile
@@ -5,18 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libavl
PKG_VERSION:= 0.3.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 882c68ea7f71876ca110f3b84d7ab12d
PKG_DESCR:= AVL library
PKG_SECTION:= libs
PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
WRKDIST= $(WRKDIR)/avl-$(PKG_VERSION)
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBAVL,libavl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAVL,libavl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
MAKE_FILE:= GNUmakefile
CONFIG_STYLE:= manual
diff --git a/package/libbluray/Makefile b/package/libbluray/Makefile
index d65530d..1988ce7 100644
--- a/package/libbluray/Makefile
+++ b/package/libbluray/Makefile
@@ -5,18 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libbluray
PKG_VERSION:= 0.4.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c7a1cc71cb9747f93122ec650d4ae933
PKG_DESCR:= bluray library
PKG_SECTION:= libs
PKG_URL:= http://www.videolan.org/developers/libbluray.html
PKG_SITES:= ftp://ftp.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBBLURAY,libbluray,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBLURAY,libbluray,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libbluray-install:
$(INSTALL_DIR) $(IDIR_LIBBLURAY)/usr/lib
diff --git a/package/libcapi20/Makefile b/package/libcapi20/Makefile
index 0ec18ff..6120991 100644
--- a/package/libcapi20/Makefile
+++ b/package/libcapi20/Makefile
@@ -11,19 +11,15 @@ PKG_DESCR:= CAPI library
PKG_SECTION:= libs
PKG_URL:= ftp://ftp.melware.net/capi-utils/
PKG_SITES:= ftp://ftp.melware.net/capi-utils/
-
-PKG_SUBPKGS:= LIBCAPI20 LIBCAPI20_DEV
-PKGSD_LIBCAPI20_DEV:= header files for libcapi20 library
-PKGSC_LIBCAPI20_DEV:= devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBCAPI20,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBCAPI20_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCAPI20_DEV},${PKGSC_LIBCAPI20_DEV},${PKG_OPTS}))
pre-install:
${INSTALL_DIR} ${WRKINST}/usr/lib
@@ -32,8 +28,4 @@ libcapi20-install:
${INSTALL_DIR} ${IDIR_LIBCAPI20}/usr/lib
${CP} ${WRKINST}/usr/lib/libcapi*.so* ${IDIR_LIBCAPI20}/usr/lib
-libcapi20-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBCAPI20_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBCAPI20_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libcdio/Makefile b/package/libcdio/Makefile
index fb20496..c559391 100644
--- a/package/libcdio/Makefile
+++ b/package/libcdio/Makefile
@@ -5,16 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libcdio
PKG_VERSION:= 0.90
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1b245b023fb03a58d030fd2800db3247
PKG_DESCR:= a library for CD-ROM and CD image access
PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/libcdio
PKG_SITES:= ${MASTER_SITE_GNU:=libcdio/}
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBCDIO,libcdio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBCDIO,libcdio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libcdio-install:
$(INSTALL_DIR) $(IDIR_LIBCDIO)/usr/lib
diff --git a/package/libcli/Makefile b/package/libcli/Makefile
index 17173dd..9b105cc 100755
--- a/package/libcli/Makefile
+++ b/package/libcli/Makefile
@@ -11,15 +11,11 @@ PKG_DESCR:= Cisco-like command-line interface library
PKG_SECTION:= libs
PKG_URL:= http://code.google.com/p/libcli
PKG_SITES:= http://libcli.googlecode.com/files/
-
-PKG_SUBPKGS:= LIBCLI LIBCLI_DEV
-PKGSD_LIBCLI_DEV:= command-line interface headers
-PKGSC_LIBCLI_DEV:= devel
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBCLI,libcli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBCLI_DEV,libcli-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCLI_DEV},${PKGSC_LIBCLI_DEV}))
+$(eval $(call PKG_template,LIBCLI,libcli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
@@ -27,8 +23,4 @@ libcli-install:
${INSTALL_DIR} ${IDIR_LIBCLI}/usr/lib
${CP} ${WRKINST}/usr/lib/libcli.so* ${IDIR_LIBCLI}/usr/lib
-libcli-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBCLI_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBCLI_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile
index 5002e5e..e208a56 100644
--- a/package/libdaemon/Makefile
+++ b/package/libdaemon/Makefile
@@ -11,17 +11,18 @@ PKG_DESCR:= A lightweight C library that eases the writing of UNIX daemons
PKG_SECTION:= libs
PKG_URL:= http://0pointer.de/lennart/projects/libdaemon/
PKG_SITES:= http://0pointer.de/lennart/projects/libdaemon/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
# uClibc setpgrp does not take arguments
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
CONFIGURE_ARGS+= --disable-lynx \
--disable-examples
-post-install:
+libdaemon-install:
${INSTALL_DIR} ${IDIR_LIBDAEMON}/usr/lib
${CP} ${WRKINST}/usr/lib/libdaemon.so* ${IDIR_LIBDAEMON}/usr/lib
diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile
index 78e218c..214c551 100644
--- a/package/libdnet/Makefile
+++ b/package/libdnet/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libdnet
PKG_VERSION:= 1.11
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 04c394ed8e1e7fc455456e79e908916d
PKG_DESCR:= a low-level networking library
PKG_SECTION:= libs
PKG_URL:= http://libdnet.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/}
-
-PKG_SUBPKGS:= LIBDNET LIBDNET_DEV
-PKGSD_LIBDNET_DEV:= headers for a low-level networking library
-PKGSC_LIBDNET_DEV:= devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBDNET_DEV,libdnet-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDNET_DEV},${PKGSC_LIBDNET_DEV}))
+$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no
@@ -29,12 +25,4 @@ libdnet-install:
$(INSTALL_DIR) $(IDIR_LIBDNET)/usr/lib
$(CP) $(WRKINST)/usr/lib/libdnet.so* $(IDIR_LIBDNET)/usr/lib
-libdnet-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBDNET_DEV)/usr/bin
- $(CP) $(WRKINST)/usr/bin/dnet-config $(IDIR_LIBDNET_DEV)/usr/bin
- $(INSTALL_DIR) $(IDIR_LIBDNET_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBDNET_DEV)/usr/include
-
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile
index 28742c6..4b81c7b 100644
--- a/package/libdrm/Makefile
+++ b/package/libdrm/Makefile
@@ -5,34 +5,22 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libdrm
PKG_VERSION:= 2.4.44
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 205fbaedfab827a874265420d38547f0
PKG_DESCR:= DRM library
PKG_SECTION:= libs
PKG_BUILDDEP:= libpthread-stubs cairo
PKG_URL:= http://dri.freedesktop.org/wiki/
PKG_SITES:= http://dri.freedesktop.org/libdrm/
-
-PKG_SUBPKGS:= LIBDRM LIBDRM_DEV
-PKGSD_LIBDRM_DEV:= DRM headers
-PKGSC_LIBDRM_DEV:= devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBDRM,libdrm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBDRM_DEV,libdrm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBDRM_DEV},${PKGSC_LIBDRM_DEV}))
+$(eval $(call PKG_template,LIBDRM,libdrm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libdrm-install:
$(INSTALL_DIR) $(IDIR_LIBDRM)/usr/lib
$(CP) $(WRKINST)/usr/lib/libdrm*.so* \
$(IDIR_LIBDRM)/usr/lib
-libdrm-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBDRM_DEV)/usr/lib/pkgconfig
- $(INSTALL_DATA) ${WRKINST}/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBDRM_DEV)/usr/lib/pkgconfig
- $(INSTALL_DIR) $(IDIR_LIBDRM_DEV)/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- $(IDIR_LIBDRM_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index c8ae86b..bbd8dcc 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -4,15 +4,15 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/libelf/Makefile.inc
+PKG_NAME:= libelf
PKG_DESCR:= elf library
PKG_SECTION:= libs
PKG_SITES:= http://www.mr511.de/software/
-
-PKG_SUBPKGS:= LIBELF
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= mr_cv_target_elf=yes \
ac_cv_sizeof_long_long=8
diff --git a/package/libevent/Makefile b/package/libevent/Makefile
index 45afa70..821822f 100644
--- a/package/libevent/Makefile
+++ b/package/libevent/Makefile
@@ -5,24 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libevent
PKG_VERSION:= 1.4.14b
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a00e037e4d3f9e4fe9893e8a2d27918c
PKG_DESCR:= Event notification library for event-driven network servers
PKG_SECTION:= libs
PKG_URL:= http://www.monkey.org/~provos/
PKG_SITES:= http://www.monkey.org/~provos/
+PKG_OPTS:= dev
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-stable.tar.gz
WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
-PKG_SUBPKGS:= LIBEVENT LIBEVENT_DEV
-PKGSD_LIBEVENT_DEV:= development files for libevent
-PKGSC_LIBEVENT_DEV:= devel
-
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV}))
+$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -30,8 +26,4 @@ libevent-install:
$(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib
$(CP) $(WRKINST)/usr/lib/libevent*.so* $(IDIR_LIBEVENT)/usr/lib
-libevent-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBEVENT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBEVENT_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index 4bdd10e..234e86d 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -11,15 +11,11 @@ PKG_DESCR:= Foreign Function Interface library
PKG_SECTION:= libs
PKG_URL:= http://sourceware.org/libffi/
PKG_SITES:= ftp://sourceware.org/pub/libffi/
-
-PKG_SUBPKGS:= LIBFFI LIBFFI_DEV
-PKGSC_LIBFFI_DEV:= devel
-PKGSD_LIBFFI_DEV:= libffi headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFFI_DEV,libffi-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFFI_DEV},${PKGSC_LIBFFI_DEV}))
+$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-builddir
@@ -27,8 +23,4 @@ libffi-install:
${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib
${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib
-libffi-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBFFI_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFFI_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index dad0519..bac9e45 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -12,25 +12,14 @@ PKG_SECTION:= x11/libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= xproto zlib
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBFONTENC LIBFONTENC_DEV
-PKGSC_LIBFONTENC_DEV:= devel
-PKGSD_LIBFONTENC_DEV:= libfontenc headers
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFONTENC_DEV,libfontenc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFONTENC_DEV},${PKGSC_LIBFONTENC_DEV}))
+$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libfontenc-install:
${INSTALL_DIR} ${IDIR_LIBFONTENC}/usr/lib
${CP} ${WRKINST}/usr/lib/libfontenc.so* ${IDIR_LIBFONTENC}/usr/lib
-libfontenc-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBFONTENC_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFONTENC_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBFONTENC_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fontenc.pc \
- ${IDIR_LIBFONTENC_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index a5369fb..4a1856d 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libgcrypt
PKG_VERSION:= 1.5.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 78f8f8bec4580f75b25816f7896d0389
PKG_DESCR:= GNU crypto library
PKG_SECTION:= libs
@@ -13,15 +13,11 @@ PKG_DEPENDS:= libgpg-error
PKG_BUILDDEP:= libgpg-error
PKG_URL:= http://directory.fsf.org/project/libgcrypt
PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-
-PKG_SUBPKGS:= LIBGCRYPT LIBGCRYPT_DEV
-PKGSD_LIBGCRYPT_DEV:= GNU crypto headers
-PKGSC_LIBGCRYPT_DEV:= devel
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGCRYPT_DEV,libgcrypt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGCRYPT_DEV},${PKGSC_LIBGCRYPT_DEV}))
+$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-asm \
--with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr"
@@ -31,12 +27,4 @@ libgcrypt-install:
${CP} ${WRKINST}/usr/lib/libgcrypt.so* \
${IDIR_LIBGCRYPT}/usr/lib
-libgcrypt-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBGCRYPT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/libgcrypt-config \
- ${IDIR_LIBGCRYPT_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 79f40ae..02eeef9 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gd
PKG_VERSION:= 2.0.35
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede
PKG_DESCR:= A library for the dynamic creation of images
PKG_SECTION:= libs
@@ -13,17 +13,12 @@ PKG_DEPENDS:= libjpeg libpng
PKG_BUILDDEP:= libpng jpeg
PKG_URL:= http://www.libgd.org/
PKG_SITES:= http://www.libgd.org/releases/
-
-PKG_SUBPKGS:= LIBGD LIBGD_DEV
-PKGSC_LIBGD_DEV:= devel
-PKGSD_LIBGD_DEV:= libgd headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGD_DEV,libgd-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGD_DEV},${PKGSC_LIBGD_DEV}))
+$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-#CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_TARGET_DIR}/usr/bin/libpng12-config"
CONFIGURE_ARGS+= --without-x \
--without-freetype \
--with-jpeg=${STAGING_TARGET_DIR}/usr \
@@ -34,8 +29,4 @@ libgd-install:
${INSTALL_DIR} ${IDIR_LIBGD}/usr/lib
${CP} ${WRKINST}/usr/lib/libgd.so* ${IDIR_LIBGD}/usr/lib
-libgd-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBGD_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGD_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libglew/Makefile b/package/libglew/Makefile
index 0cfa8ec..5e9d623 100644
--- a/package/libglew/Makefile
+++ b/package/libglew/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libglew
PKG_VERSION:= 1.10.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2f09e5e6cb1b9f3611bcac79bc9c2d5d
PKG_DESCR:= OpenGL Extension Wrangler Library (GLEW)
PKG_SECTION:= libs
@@ -13,13 +13,14 @@ PKG_DEPENDS:= libx11 libxmu libxi libxext
PKG_BUILDDEP:= libX11 libXmu libXi libXext
PKG_URL:= http://glew.sourceforge.net/index.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=glew/}
+PKG_OPTS:= dev
DISTFILES:= glew-$(PKG_VERSION).tgz
WRKDIST= ${WRKDIR}/glew-$(PKG_VERSION)
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBGLEW,libglew,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGLEW,libglew,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr'
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index 9f19388..ac27c34 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -5,35 +5,23 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libgpg-error
PKG_VERSION:= 1.9
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 521b98aa9395e7eaf0ef2236233a0796
PKG_DESCR:= a helper library for common error codes and descriptions
PKG_SECTION:= libs
PKG_URL:= http://www.gnupg.org/
PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/
-
-PKG_SUBPKGS:= LIBGPG_ERROR LIBGPG_ERROR_DEV
-PKGSD_LIBGPG_ERROR_DEV:=common error code and description headers
-PKGSC_LIBGPG_ERROR_DEV:=devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGPG_ERROR_DEV,libgpg-error-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGPG_ERROR_DEV},${PKGSC_LIBGPG_ERROR_DEV}))
+$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libgpg-error-install:
${INSTALL_DIR} ${IDIR_LIBGPG_ERROR}/usr/lib
${CP} ${WRKINST}/usr/lib/libgpg-error.so* \
${IDIR_LIBGPG_ERROR}/usr/lib
-libgpg-error-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBGPG_ERROR_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/gpg-error.h \
- ${IDIR_LIBGPG_ERROR_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBGPG_ERROR_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/gpg-error-config \
- ${IDIR_LIBGPG_ERROR_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index 90a2d24..5e6b8b2 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -5,30 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libgssglue
PKG_VERSION:= 0.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 48aaad11b7371ba3270faa322202c038
PKG_DESCR:= GSS glue library for NFSv4
PKG_SECTION:= libs
PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
-
-PKG_SUBPKGS:= LIBGSSGLUE LIBGSSGLUE_DEV
-PKGSD_LIBGSSGLUE_DEV:= GSS glue headers for NFSv4
-PKGSC_LIBGSSGLUE_DEV:= devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGSSGLUE_DEV,libgssglue-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGSSGLUE_DEV},${PKGSC_LIBGSSGLUE_DEV}))
+$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libgssglue-install:
$(INSTALL_DIR) $(IDIR_LIBGSSGLUE)/usr/lib
$(CP) $(WRKINST)/usr/lib/libgssglue.so* $(IDIR_LIBGSSGLUE)/usr/lib
-libgssglue-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBGSSGLUE_DEV)/usr/include
- ${CP} $(WRKINST)/usr/include/* $(IDIR_LIBGSSGLUE_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBGSSGLUE_DEV)/usr/lib/pkgconfig
- ${INSTALL_DATA} $(WRKINST)/usr/lib/pkgconfig/libgssglue.pc \
- $(IDIR_LIBGSSGLUE_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index 7541c31..0cab56e 100644
--- a/package/libhugetlbfs/Makefile
+++ b/package/libhugetlbfs/Makefile
@@ -5,25 +5,26 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libhugetlbfs
PKG_VERSION:= 2.11
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 35e68f16b704f2e339622a8ca07fdee0
PKG_DESCR:= easy hugepage access
PKG_SECTION:= libs
PKG_URL:= http://libhugetlbfs.ozlabs.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
+PKG_OPTS:= dev
-PKG_CFLINE_LIBHUGETLBFS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc musl
PKG_ARCH_DEPENDS:= x86 x86_64
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBHUGETLBFS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBHUGETLBFS,libhugetlbfs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= PREFIX=/usr DESTDIR=${WRKINST} ADK_ARCH=${CPU_ARCH}
ALL_TARGET:= libs tools
-post-install:
+libhugetlbfs-install:
$(INSTALL_DIR) $(IDIR_LIBHUGETLBFS)/usr/{bin,lib,share/libhugetlbfs/ldscripts}
$(INSTALL_BIN) $(WRKINST)/usr/bin/{cpupcstat,huge{adm,ctl,edit},pagesize} \
$(IDIR_LIBHUGETLBFS)/usr/bin
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index 645cf33..114c473 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -5,25 +5,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libiconv
PKG_VERSION:= 1.13.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7ab33ebd26687c744a37264a330bbe9a
PKG_DESCR:= character set conversion library
PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/libiconv/
PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/}
-
-PKG_SUBPKGS:= LIBICONV LIBICONV_DEV
-PKGSC_LIBICONV_DEV:= devel
-PKGSD_LIBICONV_DEV:= header files for libiconv
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBICONV_DEV,libiconv-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBICONV_DEV},${PKGSC_LIBICONV_DEV}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS+= -fPIC
@@ -35,8 +31,4 @@ libiconv-install:
${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib
${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/
-libiconv-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBICONV_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBICONV_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index d2819bf..c8515b4 100644
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -5,17 +5,18 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libid3tag
PKG_VERSION:= 0.15.1b
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= e5808ad997ba32c498803822078748c3
PKG_DESCR:= an ID3 tag manipulation library
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/}
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-debugging \
--disable-profiling
@@ -24,7 +25,7 @@ pre-install:
${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
${CP} ./files/id3tag.pc ${WRKINST}/usr/lib/pkgconfig
-post-install:
+libid3tag-install:
${INSTALL_DIR} ${IDIR_LIBID3TAG}/usr/lib
${CP} ${WRKINST}/usr/lib/libid3tag.so* ${IDIR_LIBID3TAG}/usr/lib/
diff --git a/package/libjasper/Makefile b/package/libjasper/Makefile
index ad95d89..fe9bb52 100644
--- a/package/libjasper/Makefile
+++ b/package/libjasper/Makefile
@@ -5,19 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libjasper
PKG_VERSION:= 1.900
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a342b2b4495b3e1394e161eb5d85d754
PKG_DESCR:= implementation of the codec specified in the JPEG-2000 Part-1 standard
PKG_SECTION:= libs
PKG_URL:= http://www.ece.uvic.ca/~frodo/jasper/
PKG_SITES:= http://www.ece.uvic.ca/~frodo/jasper/software/
+PKG_OPTS:= dev
DISTFILES:= jasper-${PKG_VERSION}.1.zip
WRKDIST= ${WRKDIR}/jasper-$(PKG_VERSION).1
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBJASPER,libjasper,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBJASPER,libjasper,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libjasper-install:
$(INSTALL_DIR) $(IDIR_LIBJASPER)/usr/lib
diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile
index 937864d..31445e4 100644
--- a/package/libjpeg-turbo/Makefile
+++ b/package/libjpeg-turbo/Makefile
@@ -5,16 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libjpeg-turbo
PKG_VERSION:= 1.3.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= e1e65cc711a1ade1322c06ad4a647741
PKG_DESCR:= a JPEG library
PKG_SECTION:= libs
PKG_URL:= http://libjpeg-turbo.virtualgl.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libjpeg-turbo-install:
$(INSTALL_DIR) $(IDIR_LIBJPEG_TURBO)/usr/lib
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index 4aa9a16..b95d294 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -5,35 +5,27 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= lzo
PKG_VERSION:= 2.04
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a383c7055a310e2a71b9ecd19cfea238
PKG_DESCR:= a real-time data compression library
PKG_SECTION:= libs
PKG_URL:= http://www.oberhumer.com/opensource/lzo
PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/
-
-PKG_SUBPKGS:= LIBLZO LIBLZO_DEV
-PKGSD_LIBLZO_DEV:= lzo library headers
-PKGSC_LIBLZO_DEV:= devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
-$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV},$(PKG_OPTS)))
CONFIGURE_ARGS+= --enable-static
MAKE_FLAGS+= CFLAGS_O="${TARGET_CFLAGS}"
-post-install:
+liblzo-install:
${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib
${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib
-liblzo-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBLZO_DEV}/usr/include/lzo
- ${CP} ${WRKINST}/usr/include/lzo/*.h ${IDIR_LIBLZO_DEV}/usr/include/lzo
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index eed9882..13983d1 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -5,21 +5,17 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libmad
PKG_VERSION:= 0.15.1b
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 1be543bc30c56fb6bea1d7bf6a64e66c
PKG_DESCR:= An high-quality MPEG audio decoding library
PKG_SECTION:= libs
PKG_URL:= http://sourceforge.net/projects/mad
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/}
-
-PKG_SUBPKGS:= LIBMAD LIBMAD_DEV
-PKGSD_LIBMAD_DEV:= development files for libmad
-PKGSC_LIBMAD_DEV:= devel
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV}))
+$(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
FPM:=default
ifeq (${ARCH},i386)
@@ -53,8 +49,4 @@ libmad-install:
${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib
${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/
-libmad-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBMAD_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBMAD_DEV}/usr/include/
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile
index 1f8d773..558264c 100644
--- a/package/libmicrohttpd/Makefile
+++ b/package/libmicrohttpd/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libmicrohttpd
PKG_VERSION:= 0.9.26
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= bdac9b62fa3080890f9ab44cf29749fc
PKG_DESCR:= a C library make it easy to run an HTTP server
PKG_SECTION:= libs
@@ -13,10 +13,11 @@ PKG_DEPENDS:= libgcrypt
PKG_BUILDDEP:= libgcrypt
PKG_URL:= http://www.gnu.org/software/libmicrohttpd/
PKG_SITES:= ${MASTER_SITE_GNU:=libmicrohttpd/}
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --with-libgcrypt-prefix=$(STAGING_DIR)/usr
diff --git a/package/libmms/Makefile b/package/libmms/Makefile
index f32301a..3e7ec81 100644
--- a/package/libmms/Makefile
+++ b/package/libmms/Makefile
@@ -5,18 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libmms
PKG_VERSION:= 0.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= cf83053ec891f14e73a04c84d9de08ee
PKG_DESCR:= common library for parsing mms:// type network streams
PKG_SECTION:= libs
PKG_URL:= https://launchpad.net/libmms
PKG_SITES:= http://launchpad.net/libmms/trunk/0.5/+download/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMMS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMMS,libmms,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libmms-install:
${INSTALL_DIR} ${IDIR_LIBMMS}/usr/lib
${CP} ${WRKINST}/usr/lib/libmms.so* ${IDIR_LIBMMS}/usr/lib/
diff --git a/package/libmnl/Makefile b/package/libmnl/Makefile
index f46fd87..6536063 100644
--- a/package/libmnl/Makefile
+++ b/package/libmnl/Makefile
@@ -5,18 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libmnl
PKG_VERSION:= 1.0.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7d95fc3bea3365bc03c48e484224f65f
PKG_DESCR:= minimalistic user-space library oriented to Netlink developers
PKG_SECTION:= libs
PKG_URL:= http://www.netfilter.org/projects/libmnl/
PKG_SITES:= http://www.netfilter.org/projects/libmnl/files/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBMNL,libmnl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMNL,libmnl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libmnl-install:
$(INSTALL_DIR) $(IDIR_LIBMNL)/usr/lib
diff --git a/package/libmodplug/Makefile b/package/libmodplug/Makefile
index 4a4c533..f08435e 100644
--- a/package/libmodplug/Makefile
+++ b/package/libmodplug/Makefile
@@ -5,16 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libmodplug
PKG_VERSION:= 0.8.8.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fddc3c704c5489de2a3cf0fedfec59db
PKG_DESCR:= a MOD player library
PKG_SECTION:= libs
PKG_URL:= http://modplug-xmms.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/libmodplug/0.8.8.4/}
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBMODPLUG,libmodplug,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMODPLUG,libmodplug,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libmodplug-install:
$(INSTALL_DIR) $(IDIR_LIBMODPLUG)/usr/lib
diff --git a/package/libmpc/Makefile b/package/libmpc/Makefile
index 4c92d1f..0a0baeb 100644
--- a/package/libmpc/Makefile
+++ b/package/libmpc/Makefile
@@ -4,24 +4,20 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/mpc/Makefile.inc
+PKG_NAME:= mpc
PKG_DESCR:= GNU multiprecision arithmetic library
PKG_SECTION:= libs
PKG_BUILDDEP:= gmp mpfr
PKG_URL:= http://www.multiprecision.org/
-
-PKG_SUBPKGS:= LIBMPC LIBMPC_DEV
+PKG_LIBNAME:= libmpc
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMPC,libmpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMPC_DEV,libmpc-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMPC,libmpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libmpc-install:
${INSTALL_DIR} ${IDIR_LIBMPC}/usr/lib
${CP} ${WRKINST}/usr/lib/libmpc.so* ${IDIR_LIBMPC}/usr/lib
-libmpc-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBMPC_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMPC_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmpdclient/Makefile b/package/libmpdclient/Makefile
index 9e46a88..9949a16 100644
--- a/package/libmpdclient/Makefile
+++ b/package/libmpdclient/Makefile
@@ -5,24 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libmpdclient
PKG_VERSION:= 2.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 79f6c810c291fa4f382a92c8e25123de
PKG_DESCR:= library for interfacing MPD
PKG_SECTION:= libs
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/libmpdclient/2/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_SUBPKGS:= LIBMPDCLIENT LIBMPDCLIENT_DEV
-PKGSD_LIBMPDCLIENT_DEV:=headers for interfacing MPD
-PKGSC_LIBMPDCLIENT_DEV:=devel
-PKGSS_LIBMPDCLIENT_DEV:=libmpdclient
-
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBMPDCLIENT,libmpdclient,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMPDCLIENT_DEV,libmpdclient-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBMPDCLIENT_DEV},${PKGSD_LIBMPDCLIENT_DEV},${PKGSC_LIBMPDCLIENT_DEV}))
+$(eval $(call PKG_template,LIBMPDCLIENT,libmpdclient,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no
CONFIGURE_ARGS+= --disable-documentation
@@ -32,12 +27,4 @@ libmpdclient-install:
$(CP) $(WRKINST)/usr/lib/libmpdclient*.so* \
$(IDIR_LIBMPDCLIENT)/usr/lib
-libmpdclient-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBMPDCLIENT_DEV)/usr/include
- ${CP} $(WRKINST)/usr/include/* \
- $(IDIR_LIBMPDCLIENT_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBMPDCLIENT_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBMPDCLIENT_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmpeg2/Makefile b/package/libmpeg2/Makefile
index 6248b67..200a79b 100644
--- a/package/libmpeg2/Makefile
+++ b/package/libmpeg2/Makefile
@@ -5,16 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libmpeg2
PKG_VERSION:= 0.5.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 0f92c7454e58379b4a5a378485bbd8ef
PKG_DESCR:= MPEG-1 & -2 decoding library
PKG_SECTION:= libs
PKG_URL:= http://libmpeg2.sourceforge.net/
PKG_SITES:= http://libmpeg2.sourceforge.net/files/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBMPEG2,libmpeg2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMPEG2,libmpeg2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-sdl
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index 9e6b766..916d390 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libnet
PKG_VERSION:= 1.1.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a9bc1d75a610efcfee200d3e28d8eb8f
PKG_DESCR:= a low-level packet creation library
PKG_SECTION:= libs
@@ -14,15 +14,11 @@ PKG_BUILDDEP:= libpcap
PKG_URL:= http://sourceforge.net/projects/libnet-dev/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/}
PKG_NEED_CXX:= 1
-
-PKG_SUBPKGS:= LIBNET LIBNET_DEV
-PKGSC_LIBNET_DEV:= devel
-PKGSD_LIBNET_DEV:= libnet headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNET_DEV,libnet-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNET_DEV},${PKGSC_LIBNET_DEV}))
+$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
ENDIAN:=lil
@@ -43,11 +39,4 @@ libnet-install:
${INSTALL_DIR} ${IDIR_LIBNET}/usr/lib
${CP} ${WRKINST}/usr/lib/libnet.so* ${IDIR_LIBNET}/usr/lib
-libnet-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBNET_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNET_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBNET_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/libnet-config \
- ${IDIR_LIBNET_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnetfilter_acct/Makefile b/package/libnetfilter_acct/Makefile
index a61102f..4c88722 100644
--- a/package/libnetfilter_acct/Makefile
+++ b/package/libnetfilter_acct/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_acct
PKG_VERSION:= 1.0.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2118d9514c079839ebd9cb3144ad2ad7
PKG_DESCR:= API to extended accounting infrastructure
PKG_SECTION:= libs
@@ -13,14 +13,15 @@ PKG_DEPENDS:= libnfnetlink
PKG_BUILDDEP:= libnfnetlink
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_acct/
PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_acct/files/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNETFILTER_ACCT,libnetfilter-acct,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETFILTER_ACCT,libnetfilter-acct,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libnetfilter-acct-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_ACCT)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnetfilter_acct*so* \
$(IDIR_LIBNETFILTER_ACCT)/usr/lib/
diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile
index 8f15fe5..8de1964 100644
--- a/package/libnetfilter_conntrack/Makefile
+++ b/package/libnetfilter_conntrack/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_conntrack
PKG_VERSION:= 1.0.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 73394a3d8d0cfecc6abb6027b4792d52
PKG_DESCR:= API to connection tracking state table
PKG_SECTION:= libs
@@ -13,28 +13,17 @@ PKG_DEPENDS:= libnfnetlink
PKG_BUILDDEP:= libnfnetlink
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_conntrack/
PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_conntrack/files/
-
-PKG_SUBPKGS:= LIBNETFILTER_CONNTRACK LIBNETFILTER_CONNTRACK_DEV
-PKGSC_LIBNETFILTER_CONNTRACK_DEV:= devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK,libnetfilter-conntrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK_DEV,libnetfilter-conntrack-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBNETFILTER_CONNTRACK_DEV}))
+$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK,libnetfilter-conntrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libnetfilter-conntrack-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnetfilter_conntrack*so* \
$(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib
-libnetfilter-conntrack-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBNETFILTER_CONNTRACK_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnetfilter_cthelper/Makefile b/package/libnetfilter_cthelper/Makefile
index d086fc7..df0f8b9 100644
--- a/package/libnetfilter_cthelper/Makefile
+++ b/package/libnetfilter_cthelper/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_cthelper
PKG_VERSION:= 1.0.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b2efab1a3a198a5add448960ba011acd
PKG_DESCR:= userspace library that provides the API to the user-space helper infrastructure
PKG_SECTION:= libs
@@ -13,14 +13,15 @@ PKG_DEPENDS:= libnfnetlink libmnl
PKG_BUILDDEP:= libnfnetlink libmnl
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_cthelper/
PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_cthelper/files/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNETFILTER_CTHELPER,libnetfilter-cthelper,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETFILTER_CTHELPER,libnetfilter-cthelper,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libnetfilter-cthelper-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_CTHELPER)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnetfilter_cthelper*so* \
$(IDIR_LIBNETFILTER_CTHELPER)/usr/lib/
diff --git a/package/libnetfilter_cttimeout/Makefile b/package/libnetfilter_cttimeout/Makefile
index 01076e7..5fa0c4e 100644
--- a/package/libnetfilter_cttimeout/Makefile
+++ b/package/libnetfilter_cttimeout/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_cttimeout
PKG_VERSION:= 1.0.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7697437fc9ebb6f6b83df56a633db7f9
PKG_DESCR:= API to the fine-grain connection tracking timeout infrastructure
PKG_SECTION:= libs
@@ -13,14 +13,15 @@ PKG_DEPENDS:= libnfnetlink libmnl
PKG_BUILDDEP:= libnfnetlink libmnl
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_cttimeout/
PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_cttimeout/files/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNETFILTER_CTTIMEOUT,libnetfilter-cttimeout,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETFILTER_CTTIMEOUT,libnetfilter-cttimeout,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libnetfilter-cttimeout-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_CTTIMEOUT)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnetfilter_cttimeout*so* \
$(IDIR_LIBNETFILTER_CTTIMEOUT)/usr/lib/
diff --git a/package/libnetfilter_log/Makefile b/package/libnetfilter_log/Makefile
index 6466169..0443ef0 100644
--- a/package/libnetfilter_log/Makefile
+++ b/package/libnetfilter_log/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_log
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2a4bb0654ae675a52d2e8d1c06090b94
PKG_DESCR:= API to packets that have been logged
PKG_SECTION:= libs
@@ -13,29 +13,17 @@ PKG_DEPENDS:= libnfnetlink
PKG_BUILDDEP:= libnfnetlink
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_log/
PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_log/files/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_SUBPKGS:= LIBNETFILTER_LOG LIBNETFILTER_LOG_DEV
-PKGSC_LIBNETFILTER_LOG_DEV:= devel
-PKGSD_LIBNETFILTER_LOG_DEV:= libnetfilter-log headers
-
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNETFILTER_LOG,libnetfilter-log,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNETFILTER_LOG_DEV,libnetfilter-log-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNETFILTER_LOG_DEV},${PKGSC_LIBNETFILTER_LOG_DEV}))
+$(eval $(call PKG_template,LIBNETFILTER_LOG,libnetfilter-log,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libnetfilter-log-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnetfilter_log*so* \
$(IDIR_LIBNETFILTER_LOG)/usr/lib
-libnetfilter-log-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBNETFILTER_LOG_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBNETFILTER_LOG_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile
index ef088c5..4066955 100644
--- a/package/libnetfilter_queue/Makefile
+++ b/package/libnetfilter_queue/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnetfilter_queue
PKG_VERSION:= 1.0.2
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= df09befac35cb215865b39a36c96a3fa
PKG_DESCR:= API to packets that have been queued by the kernel packet filter
PKG_SECTION:= libs
@@ -13,14 +13,15 @@ PKG_DEPENDS:= libnfnetlink libmnl
PKG_BUILDDEP:= libnfnetlink libmnl
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_queue/
PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_queue/files/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNETFILTER_QUEUE,libnetfilter-queue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETFILTER_QUEUE,libnetfilter-queue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libnetfilter-queue-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_QUEUE)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnetfilter_queue*so* \
$(IDIR_LIBNETFILTER_QUEUE)/usr/lib/
diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile
index a289130..e195457 100644
--- a/package/libnettle/Makefile
+++ b/package/libnettle/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnettle
PKG_VERSION:= 2.7.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 003d5147911317931dd453520eb234a5
PKG_DESCR:= crypto library
PKG_SECTION:= libs
@@ -13,13 +13,14 @@ PKG_DEPENDS:= libgmp
PKG_BUILDDEP:= gmp
PKG_URL:= http://www.lysator.liu.se/~nisse/
PKG_SITES:= http://www.lysator.liu.se/~nisse/archive/
+PKG_OPTS:= dev
DISTFILES:= nettle-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/nettle-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNETTLE,libnettle,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETTLE,libnettle,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libnettle-install:
$(INSTALL_DIR) $(IDIR_LIBNETTLE)/usr/lib
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index aeae931..07fe668 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -5,33 +5,22 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnfnetlink
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 98927583d2016a9fb1936fed992e2c5e
PKG_DESCR:= low-level library for netfilter related kernel/userspace communication
PKG_SECTION:= libs
PKG_URL:= http://www.netfilter.org/projects/libnfnetlink/
PKG_SITES:= http://www.netfilter.org/projects/libnfnetlink/files/
-
-PKG_SUBPKGS:= LIBNFNETLINK LIBNFNETLINK_DEV
-PKGSD_LIBNFNETLINK_DEV:=libnfnetlink headers
-PKGSC_LIBNFNETLINK_DEV:=devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNFNETLINK,libnfnetlink,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNFNETLINK_DEV,libnfnetlink-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNFNETLINK_DEV},${PKGSC_LIBNFNETLINK_DEV}))
+$(eval $(call PKG_template,LIBNFNETLINK,libnfnetlink,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libnfnetlink-install:
$(INSTALL_DIR) $(IDIR_LIBNFNETLINK)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnfnetlink.so* $(IDIR_LIBNFNETLINK)/usr/lib
-libnfnetlink-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBNFNETLINK_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* $(IDIR_LIBNFNETLINK_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_LIBNFNETLINK_DEV)/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBNFNETLINK_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile
index 7a9e40d..c6dc0a2 100644
--- a/package/libnfsidmap/Makefile
+++ b/package/libnfsidmap/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnfsidmap
PKG_VERSION:= 0.25
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 2ac4893c92716add1a1447ae01df77ab
PKG_DESCR:= idmap library for NFSv4
PKG_SECTION:= libs
PKG_URL:= http://www.citi.umich.edu/projects/nfsv4/linux/
PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
-
-PKG_SUBPKGS:= LIBNFSIDMAP LIBNFSIDMAP_DEV
-PKGSC_LIBNFSIDMAP_DEV:= devel
-PKGSD_LIBNFSIDMAP_DEV:= headers for NFSv4 idmap library
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNFSIDMAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNFSIDMAP_DEV,libnfsidmap-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNFSIDMAP_DEV},${PKGSC_LIBNFSIDMAP_DEV}))
+$(eval $(call PKG_template,LIBNFSIDMAP,libnfsidmap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libnfsidmap-install:
$(INSTALL_DIR) $(IDIR_LIBNFSIDMAP)/usr/lib/libnfsidmap
@@ -28,9 +24,4 @@ libnfsidmap-install:
$(CP) $(WRKINST)//usr/lib/libnfsidmap/static.so \
$(IDIR_LIBNFSIDMAP)/usr/lib/libnfsidmap
-libnfsidmap-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBNFSIDMAP_DEV)/usr/include
- $(INSTALL_DATA) ${WRKINST}/usr/include/nfsidmap.h \
- $(IDIR_LIBNFSIDMAP_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index fc80bbc..29930e7 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libnids
PKG_VERSION:= 1.24
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 72d37c79c85615ffe158aa524d649610
PKG_DESCR:= Network Intrusion Detection System library
PKG_SECTION:= libs
@@ -13,15 +13,11 @@ PKG_DEPENDS:= libnet libpcap glib
PKG_BUILDDEP:= libnet libpcap glib
PKG_URL:= http://libnids.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnids/}
-
-PKG_SUBPKGS:= LIBNIDS LIBNIDS_DEV
-PKGSC_LIBNIDS_DEV:= devel
-PKGSD_LIBNIDS_DEV:= libnids headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNIDS_DEV,libnids-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNIDS_DEV},${PKGSC_LIBNIDS_DEV}))
+$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -lpthread
CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no
@@ -32,8 +28,4 @@ libnids-install:
${INSTALL_DIR} ${IDIR_LIBNIDS}/usr/lib
${CP} ${WRKINST}/usr/lib/libnids.so* ${IDIR_LIBNIDS}/usr/lib
-libnids-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBNIDS_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNIDS_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index 68b45bf..ab6872b 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -5,22 +5,18 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libnl
PKG_VERSION:= 3.2.22
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 2e1c889494d274aca24ce5f6a748e66e
PKG_DESCR:= Netlink library
PKG_SECTION:= libs
PKG_URL:= http://www.infradead.org/~tgr/libnl/
PKG_SITES:= http://www.infradead.org/~tgr/libnl/files/
PKG_NOPARALLEL:= 1
-
-PKG_SUBPKGS:= LIBNL LIBNL_DEV
-PKGSD_LIBNL_DEV:= header files for netlink library
-PKGSC_LIBNL_DEV:= devel
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNL_DEV,libnl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV}))
+$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libnl-install:
${INSTALL_DIR} ${IDIR_LIBNL}/etc/libnl
@@ -38,11 +34,4 @@ libnl-install:
$(CP) ${WRKINST}/usr/lib/libnl/cli/qdisc/*.so \
${IDIR_LIBNL}/usr/lib/libnl/cli/qdisc
-libnl-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBNL_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNL_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBNL_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBNL_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnotify/Makefile b/package/libnotify/Makefile
index 038a3dd..0a5c78c 100644
--- a/package/libnotify/Makefile
+++ b/package/libnotify/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libnotify
PKG_VERSION:= 0.4.5
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 472e2c1f808848365572a9b024d9e8f5
PKG_DESCR:= notify library
PKG_SECTION:= libs
@@ -13,12 +13,13 @@ PKG_BUILDDEP:= gtk+ dbus-glib
PKG_URL:= http://www.galago-project.org/
PKG_SITES:= http://www.galago-project.org/files/releases/source/libnotify/
PKG_NEED_CXX:= 1
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNOTIFY,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNOTIFY,libnotify,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libnotify-install:
$(INSTALL_DIR) $(IDIR_LIBNOTIFY)/usr/lib
$(CP) $(WRKINST)/usr/lib/libnotify*.so* \
$(IDIR_LIBNOTIFY)/usr/lib
diff --git a/package/libogg/Makefile b/package/libogg/Makefile
index 4738127..eb78bf8 100644
--- a/package/libogg/Makefile
+++ b/package/libogg/Makefile
@@ -5,28 +5,20 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libogg
PKG_VERSION:= 1.1.3
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= eaf7dc6ebbff30975de7527a80831585
PKG_DESCR:= The Ogg bitstream handling library
PKG_SECTION:= libs
PKG_URL:= http://www.xiph.org/ogg
PKG_SITES:= http://downloads.xiph.org/releases/ogg/
-
-PKG_SUBPKGS:= LIBOGG LIBOGG_DEV
-PKGSD_LIBOGG_DEV:= development files for libogg
-PKGSC_LIBOGG_DEV:= devel
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV}))
+$(eval $(call PKG_template,LIBOGG,libogg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libogg-install:
${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib
${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib
-libogg-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBOGG_DEV}/usr/include/ogg
- ${CP} ${WRKINST}/usr/include/ogg/*.h ${IDIR_LIBOGG_DEV}/usr/include/ogg
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libol/Makefile b/package/libol/Makefile
index 29c32ad..b3373a3 100644
--- a/package/libol/Makefile
+++ b/package/libol/Makefile
@@ -5,18 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libol
PKG_VERSION:= 0.3.18
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= cbadf4b7ea276dfa85acc38a1cc5ff17
PKG_DESCR:= Support library for syslog-ng
PKG_SECTION:= libs
PKG_URL:= http://www.balabit.com/
PKG_SITES:= http://www.balabit.com/downloads/files/libol/0.3/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOL,libol,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libol-install:
${INSTALL_DIR} ${IDIR_LIBOL}/usr/lib
${CP} ${WRKINST}/usr/lib/libol.so* ${IDIR_LIBOL}/usr/lib/
diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile
index fa6b200..e5959b9 100644
--- a/package/libosip2/Makefile
+++ b/package/libosip2/Makefile
@@ -5,24 +5,25 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libosip2
PKG_VERSION:= 3.3.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 81493bb4d4ae6d55b71a0d4369339125
PKG_DESCR:= a SIP (Session Initiation Protocol) implementation
PKG_SECTION:= libs
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.gnu.org/software/osip
PKG_SITES:= ${MASTER_SITE_GNU:=osip/}
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOSIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOSIP2,libosip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-trace \
--enable-pthread \
--enable-semaphore \
--enable-ntimer
-post-install:
+libosip2-install:
${INSTALL_DIR} ${IDIR_LIBOSIP2}/usr/lib
${CP} ${WRKINST}/usr/lib/libosip{,parser}2.so* \
${IDIR_LIBOSIP2}/usr/lib/
diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index e4823c2..9a7092c 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libp11
PKG_VERSION:= 0.2.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 564ab53ad7353903ddfdc15b153c44fb
PKG_DESCR:= library implementing a small layer on top of PKCS11 API
PKG_SECTION:= libs
@@ -13,25 +13,14 @@ PKG_DEPENDS:= libopenssl libltdl
PKG_BUILDDEP:= openssl libtool
PKG_URL:= http://www.opensc-project.org/libp11
PKG_SITES:= http://www.opensc-project.org/files/libp11/
-
-PKG_SUBPKGS:= LIBP11 LIBP11_DEV
-PKGSD_LIBP11_DEV:= development files for libp11
-PKGSC_LIBP11_DEV:= devel
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV}))
+$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+libp11-install:
${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib
${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib
-libp11-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBP11_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBP11_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBP11_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/libp11.pc \
- ${IDIR_LIBP11_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 2fdb3db..e602075 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -5,24 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libpcap
PKG_VERSION:= 1.3.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f78455a92622b7a3c05c58b6ad1cec7e
PKG_DESCR:= a low-level packet capture library
PKG_SECTION:= libs
PKG_URL:= http://www.tcpdump.org/
PKG_SITES:= http://www.tcpdump.org/release/
-
-PKG_SUBPKGS:= LIBPCAP LIBPCAP_DEV
-PKGSD_LIBPCAP_DEV:= headers for a low-level packet capture library
-PKGSC_LIBPCAP_DEV:= devel
+PKG_OPTS:= dev
PKG_FLAVOURS_LIBPCAP:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBPCAP_DEV,libpcap-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCAP_DEV},${PKGSC_LIBPCAP_DEV}))
+$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= ac_cv_linux_vers=26
CONFIGURE_ARGS+= --disable-yydebug \
@@ -44,8 +40,4 @@ libpcap-install:
${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib
${CP} ${WRKINST}/usr/lib/libpcap.so* ${IDIR_LIBPCAP}/usr/lib
-libpcap-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBPCAP_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPCAP_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index e603ac6..8b598d7 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -5,32 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libpciaccess
PKG_VERSION:= 0.13.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 3a95b70913621840bf8af616ea01d7d9
PKG_DESCR:= X.org PCI access library
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBPCIACCESS LIBPCIACCESS_DEV
-PKGSD_LIBPCIACCESS_DEV:=X.org PCI access headers
-PKGSC_LIBPCIACCESS_DEV:=devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBPCIACCESS_DEV,libpciaccess-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCIACCESS_DEV},${PKGSC_LIBPCIACCESS_DEV}))
+$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libpciaccess-install:
${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib
${CP} ${WRKINST}/usr/lib/libpciaccess.so* \
${IDIR_LIBPCIACCESS}/usr/lib
-libpciaccess-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBPCIACCESS_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/pciaccess.h \
- ${IDIR_LIBPCIACCESS_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBPCIACCESS_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/pciaccess.pc \
- ${IDIR_LIBPCIACCESS_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 9d11abd..1d43a49 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libpng
PKG_VERSION:= 1.5.15
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= ea24254980fd820964a710e4d2a947c7
PKG_DESCR:= A library for reading/writing PNG images
PKG_SECTION:= libs
@@ -13,19 +13,15 @@ PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.libpng.org/pub/png/libpng.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/}
-
-PKG_SUBPKGS:= LIBPNG LIBPNG_DEV
-PKGSD_LIBPNG_DEV:= development files for libpng
-PKGSC_LIBPNG_DEV:= devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -33,11 +29,4 @@ libpng-install:
${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib
-libpng-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPNG_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index adf2ec2..8c0ae28 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -5,23 +5,24 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libpri
PKG_VERSION:= 1.4.12
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 9de39b866f049cc20a4f431cc6245166
PKG_DESCR:= C implementation of the Primary Rate ISDN specification
PKG_SECTION:= libs
PKG_URL:= http://www.asterisk.org/
PKG_SITES:= http://downloads.asterisk.org/pub/telephony/libpri/releases/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPRI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPRI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
MAKE_FLAGS+= CC='${TARGET_CC}' LDCONFIG='' ARCH=$(ARCH)
FAKE_FLAGS+= INSTALL_BASE=/usr
-post-install:
+libpri-install:
${INSTALL_DIR} ${IDIR_LIBPRI}/usr/lib
${CP} ${WRKINST}/usr/lib/libpri.so* ${IDIR_LIBPRI}/usr/lib
diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
index 4896008..6278f9a 100644
--- a/package/libpthread-stubs/Makefile
+++ b/package/libpthread-stubs/Makefile
@@ -5,20 +5,16 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libpthread-stubs
PKG_VERSION:= 0.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a09d928c4af54fe5436002345ef71138
PKG_DESCR:= Pthread-stubs
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_URL:= http://xcb.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_LIBPTHREAD_STUBS}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/pthread-stubs.pc \
- ${IDIR_LIBPTHREAD_STUBS}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libqb/Makefile b/package/libqb/Makefile
index f4e73ac..97eec06 100644
--- a/package/libqb/Makefile
+++ b/package/libqb/Makefile
@@ -5,18 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libqb
PKG_VERSION:= 0.16.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 88a256ce5217efa420598ade393879ff
PKG_DESCR:= high performance client server reusable features
PKG_SECTION:= libs
PKG_URL:= https://github.com/asalkeld/libqb/wiki#wiki-Releases
PKG_SITES:= https://fedorahosted.org/releases/q/u/quarterback/
+PKG_OPTS:= dev
PKG_LIBC_DEPENDS:= eglibc glibc musl
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBQB,libqb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBQB,libqb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libqb-install:
$(INSTALL_DIR) $(IDIR_LIBQB)/usr/lib
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index cc0c8d3..bbc3e63 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -5,22 +5,23 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= librpcsecgss
PKG_VERSION:= 0.19
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= b45ed565bdc3099023aa35830ec92997
PKG_DESCR:= Secure RPC library for NFSv4
PKG_SECTION:= libs
PKG_DEPENDS:= libgssglue
PKG_BUILDDEP:= libgssglue
PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc
TARGET_LDFLAGS+= -ltirpc
-post-install:
+librpcsecgss-install:
$(INSTALL_DIR) $(IDIR_LIBRPCSECGSS)/usr/lib
$(CP) $(WRKINST)/usr/lib/librpcsecgss.so* $(IDIR_LIBRPCSECGSS)/usr/lib/
diff --git a/package/libsamplerate/Makefile b/package/libsamplerate/Makefile
index d469b0e..a8f8d04 100644
--- a/package/libsamplerate/Makefile
+++ b/package/libsamplerate/Makefile
@@ -5,16 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libsamplerate
PKG_VERSION:= 0.1.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1c7fb25191b4e6e3628d198a66a84f47
PKG_DESCR:= sample rate converter for audio
PKG_SECTION:= libs
PKG_URL:= http://www.mega-nerd.com/SRC/
PKG_SITES:= http://www.mega-nerd.com/SRC/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libsamplerate-install:
$(INSTALL_DIR) $(IDIR_LIBSAMPLERATE)/usr/lib
diff --git a/package/libshout/Makefile b/package/libshout/Makefile
index 335147a..13ef36c 100644
--- a/package/libshout/Makefile
+++ b/package/libshout/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libshout
PKG_VERSION:= 2.2.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 4f75fc9901c724b712c371c9a1e782d3
PKG_DESCR:= Library which can be used to write a source client for streaming
PKG_SECTION:= libs
@@ -13,15 +13,16 @@ PKG_DEPENDS:= libvorbis libogg
PKG_BUILDDEP:= libvorbis
PKG_URL:= http://directory.fsf.org/project/libshout
PKG_SITES:= http://downloads.us.xiph.org/releases/libshout/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSHOUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --with-speex=no \
--with-theora=no
-post-install:
+libshout-install:
${INSTALL_DIR} ${IDIR_LIBSHOUT}/usr/lib
${CP} ${WRKINST}/usr/lib/libshout.so* ${IDIR_LIBSHOUT}/usr/lib/
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index 84a3a19..c6bb859 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -5,22 +5,23 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libsigc++
PKG_VERSION:= 2.2.10
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 6d350ae0bc17b8915a06ce6b7e4240e8
PKG_DESCR:= Callback framework for C++
PKG_SECTION:= libs
PKG_URL:= http://libsigc.sourceforge.net
PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/}
+PKG_OPTS:= dev
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
-post-install:
+libsigc++-install:
${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib
${CP} ${WRKINST}/usr/lib/libsigc-2.0.so* ${IDIR_LIBSIGCXX}/usr/lib/
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index c81736e..9f3b56d 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -5,20 +5,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libtasn1
PKG_VERSION:= 3.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2bdd687f487c50a0382b99553866a6e0
PKG_DESCR:= an ASN.1 and DER structures manipulation library
PKG_SECTION:= libs
PKG_URL:= http://www.gnupg.org/
PKG_SITES:= http://ftp.gnu.org/gnu/libtasn1/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTASN1,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-gtk-doc-html
-post-install:
+libtasn1-install:
${INSTALL_DIR} ${IDIR_LIBTASN1}/usr/lib
${CP} ${WRKINST}/usr/lib/libtasn1.so* ${IDIR_LIBTASN1}/usr/lib
diff --git a/package/libtheora/Makefile b/package/libtheora/Makefile
index a1f26b7..aac2a22 100644
--- a/package/libtheora/Makefile
+++ b/package/libtheora/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libtheora
PKG_VERSION:= 1.1.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 292ab65cedd5021d6b7ddd117e07cd8e
PKG_DESCR:= Theora video codec
PKG_SECTION:= libs
@@ -13,12 +13,13 @@ PKG_DEPENDS:= libogg libvorbis
PKG_BUILDDEP:= libogg libvorbis
PKG_URL:= http://www.theora.org/
PKG_SITES:= http://downloads.xiph.org/releases/theora/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBTHEORA,libtheora,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBTHEORA,libtheora,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-examples
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index 896b407..bc41ce1 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -5,37 +5,30 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= tiff
PKG_VERSION:= 3.9.4
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6
PKG_DESCR:= A library for reading/writing TIFF images
PKG_SECTION:= libs
PKG_URL:= http://www.libtiff.org/
PKG_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/
PKG_NEED_CXX:= 1
-
-PKG_SUBPKGS:= LIBTIFF LIBTIFF_DEV
-PKGSD_LIBTIFF_DEV:= development files for libtiff
-PKGSC_LIBTIFF_DEV:= devel
+PKG_LIBNAME:= libtiff
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-cxx \
--disable-rpath
-post-install:
+libtiff-install:
${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib
${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/
-libtiff-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBTIFF_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBTIFF_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index f712938..088a4f5 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libtirpc
PKG_VERSION:= 0.2.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b70e6c12a369a91e69fcc3b9feb23d61
PKG_DESCR:= a transport independent RPC library
PKG_SECTION:= libs
@@ -13,17 +13,13 @@ PKG_DEPENDS:= libgssglue
PKG_BUILDDEP:= libgssglue
PKG_URL:= http://sourceforge.net/projects/libtirpc/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libtirpc/}
+PKG_OPTS: dev
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SUBPKGS:= LIBTIRPC LIBTIRPC_DEV
-PKGSD_LIBTIRPC_DEV:= tirpc headers
-PKGSC_LIBTIRPC_DEV:= devel
-
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBTIRPC_DEV,libtirpc-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIRPC_DEV},${PKGSC_LIBTIRPC_DEV}))
+$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifneq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
CONFIGURE_ARGS+= --disable-gss
@@ -36,8 +32,4 @@ libtirpc-install:
${CP} ${WRKINST}/usr/lib/libtirpc*.so* ${IDIR_LIBTIRPC}/usr/lib/
${CP} ./files/netconfig ${IDIR_LIBTIRPC}/etc
-libtirpc-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBTIRPC_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBTIRPC_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 83eae4e..f9298a0 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -11,17 +11,16 @@ PKG_DESCR:= a generic dynamic object loading library
PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/libtool/
PKG_SITES:= ${MASTER_SITE_GNU:=libtool/}
+PKG_LIBNAME:= libltdl
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBTOOL LIBLTDL LIBLTDL_DEV
+PKG_SUBPKGS:= LIBTOOL LIBLTDL
PKGSC_LIBLTDL:= libs
-PKGSD_LIBLTDL_DEV:= libltdl header files
-PKGSC_LIBLTDL_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBLTDL}))
-$(eval $(call PKG_template,LIBLTDL_DEV,libltdl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBLTDL_DEV}))
+$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBLTDL},${PKG_OPTS}))
ifeq (${ADK_HOST_OPENBSD},y)
XAKE_FLAGS+= AUTOCONF_VERSION=2.62
@@ -38,8 +37,4 @@ libltdl-install:
${INSTALL_DIR} ${IDIR_LIBLTDL}/usr/lib
${CP} ${WRKINST}/usr/lib/libltdl.so* ${IDIR_LIBLTDL}/usr/lib/
-libltdl-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBLTDL_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBLTDL_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 9ea8b22..274e6ba 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libtorrent
PKG_VERSION:= 0.13.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= d499178f72010d5067a77f41fa1a1505
PKG_DESCR:= A bittorrent library
PKG_SECTION:= libs
@@ -13,12 +13,13 @@ PKG_DEPENDS:= libopenssl libsigc++
PKG_BUILDDEP:= openssl libsigc++
PKG_URL:= http://libtorrent.rakshasa.no/
PKG_SITES:= http://libtorrent.rakshasa.no/downloads/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-aligned
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile
index 908d2b6..b1e1311 100755
--- a/package/libunistring/Makefile
+++ b/package/libunistring/Makefile
@@ -5,16 +5,17 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libunistring
PKG_VERSION:= 0.9.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= db8eca3b64163abadf8c40e5cecc261f
PKG_DESCR:= functions for manipulating Unicode strings
PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/libunistring/
PKG_SITES:= ${MASTER_SITE_GNU:=libunistring/}
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libunistring-install:
${INSTALL_DIR} ${IDIR_LIBUNISTRING}/usr/lib
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 44352b1..ec55edf 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -5,24 +5,20 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libupnp
PKG_VERSION:= 1.6.6
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 8918dcf7428cd119d0c8275765ff2833
PKG_DESCR:= The Universal Plug and Play (UPnP) SDK library
PKG_SECTION:= libs
PKG_DEPENDS:= libpthread
PKG_URL:= http://pupnp.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pupnp/}
-
-PKG_SUBPKGS:= LIBUPNP LIBUPNP_DEV
-PKGSD_LIBUPNP_DEV:= libupnp headers
-PKGSC_LIBUPNP_DEV:= devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBUPNP_DEV,libupnp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUPNP_DEV},${PKGSC_LIBUPNP_DEV}))
+$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS+= -fPIC
@@ -36,8 +32,4 @@ libupnp-install:
${INSTALL_DIR} ${IDIR_LIBUPNP}/usr/lib
${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBUPNP}/usr/lib
-libupnp-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBUPNP_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUPNP_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index 1744c50..7441504 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -5,38 +5,27 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libusb-compat
PKG_VERSION:= 0.1.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 570ac2ea085b80d1f74ddc7c6a93c0eb
PKG_DESCR:= a library for accessing Linux USB devices
PKG_SECTION:= libs
PKG_BUILDDEP:= libusb
PKG_URL:= http://libusb.wiki.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusb/}
-
-PKG_SUBPKGS:= LIBUSB_COMPAT LIBUSB_COMPAT_DEV
-PKGSD_LIBUSB_COMPAT_DEV:= header files for libusb library
-PKGSC_LIBUSB_COMPAT_DEV:= devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBUSB_COMPAT,libusb-compat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBUSB_COMPAT_DEV,libusb-compat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS}))
libusb-compat-install:
${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib
${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib
-libusb-compat-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUSB_COMPAT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBUSB_COMPAT_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index 8d3d751..365aa59 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -5,19 +5,16 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libusbx
PKG_VERSION:= 1.0.16
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 7f5715d624cd6c26b30a317eb6c2fe5e
PKG_DESCR:= a library for accessing Linux USB devices
PKG_SECTION:= libs
PKG_URL:= http://libusb.wiki.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusbx/}
-
-PKG_SUBPKGS:= LIBUSB LIBUSB_DEV
-PKGSD_LIBUSB_DEV:= header files for libusb library
-PKGSC_LIBUSB_DEV:= devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -25,7 +22,6 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBUSB_DEV,libusb-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS}))
TARGET_CPPFLAGS= -DTIMESPEC_TO_TIMEVAL=
CONFIGURE_ARGS+= --disable-udev
@@ -34,11 +30,4 @@ libusb-install:
${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib
${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib
-libusb-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBUSB_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUSB_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBUSB_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBUSB_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 61e5626..c424aff 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libvirt
PKG_VERSION:= 1.0.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 3d9f85d586c9aa3d819b626622f3fc97
PKG_DESCR:= virtualization API
PKG_SECTION:= libs
@@ -15,13 +15,14 @@ PKG_DEPENDS+= libintl dmidecode kmod-netfilter-xt-target-checksum
PKG_DEPENDS+= dnsmasq qemu libnl
PKG_URL:= http://www.libvirt.org/
PKG_SITES:= http://libvirt.org/sources/
+PKG_OPTS:= dev
PKG_HOST_DEPENDS:= !freebsd !netbsd !openbsd
PKG_ARCH_DEPENDS:= x86 x86_64
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBVIRT,libvirt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
include ${TOPDIR}/mk/python.mk
@@ -43,7 +44,7 @@ CONFIGURE_ARGS+= --without-xen \
--disable-silent-rules \
--without-sasl
-post-install:
+libvirt-install:
${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib ${IDIR_LIBVIRT}/usr/bin
${INSTALL_DIR} ${IDIR_LIBVIRT}/etc/libvirt ${IDIR_LIBVIRT}/usr/sbin
${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/share/libvirt
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index 0c301c6..91035bd 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -5,23 +5,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libvorbis
PKG_VERSION:= 1.2.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 478646358c49f34aedcce58948793619
PKG_DESCR:= Vorbis General Audio Compression Codec library
PKG_SECTION:= libs
PKG_BUILDDEP:= libogg
PKG_URL:= http://www.xiph.org/vorbis/
PKG_SITES:= http://downloads.xiph.org/releases/vorbis/
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBVORBIS LIBVORBISENC LIBVORBIS_DEV
-PKGSD_LIBVORBIS_DEV:= development files for libvorbis
-PKGSC_LIBVORBIS_DEV:= devel
+PKG_SUBPKGS:= LIBVORBIS LIBVORBISENC
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV}))
CONFIGURE_ENV+= LIBS="-lm -logg"
CONFIGURE_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \
@@ -37,8 +35,4 @@ libvorbisenc-install:
${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib
${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib
-libvorbis-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis
- ${CP} ${WRKINST}/usr/include/vorbis/*.h ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile
index e3a88a4..0a10d27 100644
--- a/package/libvorbisidec/Makefile
+++ b/package/libvorbisidec/Makefile
@@ -5,24 +5,25 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libvorbisidec
PKG_VERSION:= 1.0.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_VARIANT:= svn15687
PKG_MD5SUM:= cd3f62e87e38548c3e1120b1b2d3cac7
PKG_DESCR:= Fixed point vorbis library
PKG_SECTION:= libs
PKG_SITES:= http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}+$(PKG_VARIANT).orig.tar.gz
WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)+$(PKG_VARIANT)
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBVORBISIDEC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBVORBISIDEC,libvorbisidec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
pre-configure:
@chmod 755 ${WRKBUILD}/install-sh
-post-install:
+libvorbisidec-install:
${INSTALL_DIR} ${IDIR_LIBVORBISIDEC}/usr/lib
${CP} ${WRKINST}/usr/lib/libvorbisidec.so* \
${IDIR_LIBVORBISIDEC}/usr/lib/
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index c442d09..6205ac4 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -5,12 +5,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libvpx
PKG_VERSION:= 1.2.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f8de058e6ba14555144583a2d031fe19
PKG_DESCR:= VP8/VP9 codec library
PKG_SECTION:= libs
PKG_URL:= http://www.webmproject.org/about/
PKG_SITES:= http://webm.googlecode.com/files/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32
@@ -19,7 +20,7 @@ WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= minimal
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index f88f42f..1936ad5 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -6,16 +6,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libx264
# actually is snapshot x264-snapshot-20131010-2245
PKG_VERSION:= 1.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= e6718029b4bc955f1dbb9bdafeed3ac0
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
PKG_URL:= http://www.videolan.org/developers/x264.html
PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index cf292f3..91dbe7c 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -5,22 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libxcb
PKG_VERSION:= 1.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f715e53c9c1b25f856d14d6123663d96
PKG_DESCR:= X11 keyboard library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau xcb-proto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXCB LIBXCB_DEV
-PKGSD_LIBXCB_DEV:= XML-XCB protocol headers
-PKGSS_LIBXCB_DEV:= libxcb
-PKGSC_LIBXCB_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXCB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEV},${PKGSD_LIBXCB_DEV},${PKGSC_LIBXCB_DEV}))
+$(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
include $(TOPDIR)/mk/python.mk
@@ -31,11 +26,4 @@ libxcb-install:
${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib
-libxcb-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index 6fbca6b..dfa8f62 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -5,32 +5,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libxkbfile
PKG_VERSION:= 1.0.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f5b92ef9813c6b78105dfa960ddddcaa
PKG_DESCR:= X11 keyboard configuration extension library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= kbproto libX11
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXKBFILE LIBXKBFILE_DEV
-PKGSD_LIBXKBFILE_DEV:= X11 keyboard configuration extension headers
-PKGSC_LIBXKBFILE_DEV:= devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXKBFILE_DEV,libxkbfile-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXKBFILE_DEV},${PKGSC_LIBXKBFILE_DEV}))
+$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxkbfile-install:
${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib
${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib
-libxkbfile-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXKBFILE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBXKBFILE_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXKBFILE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xkbfile.pc \
- ${IDIR_LIBXKBFILE_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 602d2d5..182469e 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libxml2
PKG_VERSION:= 2.9.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380
PKG_DESCR:= XML C parser and toolkit
PKG_SECTION:= libs
@@ -13,18 +13,16 @@ PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.xmlsoft.org/
PKG_SITES:= http://xmlsoft.org/sources/
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBXML2 LIBXML2_DEV LIBXML2_PYTHON
-PKGSD_LIBXML2_DEV:= XML parser headers
-PKGSC_LIBXML2_DEV:= devel
+PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON
PKGSD_LIBXML2_PYTHON:= XML python bindings
PKGSC_LIBXML2_PYTHON:= libs
PKGSB_LIBXML2_PYTHON:= python2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXML2_DEV,libxml2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_DEV},${PKGSC_LIBXML2_DEV}))
+$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_PYTHON},${PKGSC_LIBXML2_PYTHON}))
include $(TOPDIR)/mk/python.mk
@@ -70,16 +68,6 @@ libxml2-install:
${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib
-libxml2-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXML2_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXML2_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXML2_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/libxml-2.0.pc \
- ${IDIR_LIBXML2_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_LIBXML2_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/xml2-config \
- ${IDIR_LIBXML2_DEV}/usr/bin
-
libxml2-python-install:
$(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 91424ca..ad2b374 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libxslt
PKG_VERSION:= 1.1.28
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 9667bf6f9310b957254fdcf6596600b7
PKG_DESCR:= XSLT Library
PKG_SECTION:= libs
@@ -14,17 +14,15 @@ PKG_BUILDDEP:= libxml2
PKG_URL:= http://xmlsoft.org/XSLT
PKG_SITES:= http://xmlsoft.org/sources/
PKG_NEED_CXX:= 1
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBXSLT LIBXSLT_DEV XSLTPROC
-PKGSD_LIBXSLT_DEV:= XSLT headers
-PKGSC_LIBXSLT_DEV:= devel
+PKG_SUBPKGS:= LIBXSLT XSLTPROC
PKGSD_XSLTPROC:= XSLT processor utility
PKGSC_XSLTPROC:= misc
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXSLT_DEV,libxslt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXSLT_DEV},${PKGSC_LIBXSLT_DEV}))
+$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC}))
CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \
@@ -45,11 +43,4 @@ libxslt-install:
${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib
${CP} ${WRKINST}/usr/lib/libexslt.so* ${IDIR_LIBXSLT}/usr/lib
-libxslt-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXSLT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/xslt-config \
- ${IDIR_LIBXSLT_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 2a83c58..525f14b 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -12,12 +12,12 @@ PKG_SECTION:= libs
PKG_URL:= http://linux-atm.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
PKG_NOPARALLEL:= 1
+PKG_LIBNAME:= libatm
+PKG_OPTS:= dev
PKG_HOST_DEPENDS:= !freebsd
-PKG_SUBPKGS:= LIBATM LIBATM_DEV BR2684CTL
-PKGSD_LIBATM_DEV:= ATM headers for Linux
-PKGSC_LIBATM_DEV:= devel
+PKG_SUBPKGS:= LIBATM BR2684CTL
PKGSD_BR2684CTL:= br2684ctl ATM utility
PKGSS_BR2684CTL:= libatm
PKGSC_BR2684CTL:= route
@@ -26,18 +26,13 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBATM_DEV,libatm-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBATM_DEV},${PKGSC_LIBATM_DEV}))
+$(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BR2684CTL},${PKGSD_BR2684CTL},${PKGSC_BR2684CTL}))
libatm-install:
${INSTALL_DIR} ${IDIR_LIBATM}/usr/lib
${CP} ${WRKINST}/usr/lib/libatm.so* ${IDIR_LIBATM}/usr/lib
-libatm-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBATM_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBATM_DEV}/usr/include
-
br2684ctl-install:
${INSTALL_DIR} ${IDIR_BR2684CTL}/usr/sbin
${CP} ${WRKINST}/usr/sbin/br2684ctl ${IDIR_BR2684CTL}/usr/sbin
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
index 0f6ba71..2751c44 100644
--- a/package/lm_sensors/Makefile
+++ b/package/lm_sensors/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= lm_sensors
PKG_VERSION:= 3.3.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8c0eebda8524fc87da1393b4564d279b
PKG_DESCR:= linux hw sensor toolset
PKG_SECTION:= misc
@@ -17,19 +17,15 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
PKG_ARCH_DEPENDS:= x86 x86_64
-PKG_SUBPKGS:= LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT
-PKGSD_LM_SENSORS_DEV:= lm_sensors header files
-PKGSC_LM_SENSORS_DEV:= devel
+PKG_SUBPKGS:= LM_SENSORS LM_SENSORS_DETECT
PKGSD_LM_SENSORS_DETECT:= lm_sensors perl scripts (e.g. sensors-detect)
PKGSC_LM_SENSORS_DETECT:= misc
PKGSS_LM_SENSORS_DETECT:= perl
PKGSB_LM_SENSORS_DETECT:= perl
-
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LM_SENSORS,lm-sensors,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LM_SENSORS_DEV,lm-sensors-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DEV},${PKGSC_LM_SENSORS_DEV}))
+$(eval $(call PKG_template,LM_SENSORS,lm-sensors,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LM_SENSORS_DETECT,lm-sensors-detect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DETECT},${PKGSC_LM_SENSORS_DETECT}))
CONFIG_STYLE:= manual
@@ -44,10 +40,6 @@ lm-sensors-install:
${INSTALL_DIR} ${IDIR_LM_SENSORS}/etc
${CP} ${WRKINST}/etc/sensors3.conf ${IDIR_LM_SENSORS}/etc
-lm-sensors-dev-install:
- ${INSTALL_DIR} ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
- ${CP} ${WRKINST}/usr/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
-
lm-sensors-detect-install:
${INSTALL_DIR} ${IDIR_LM_SENSORS_DETECT}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol
diff --git a/package/log4cplus/Makefile b/package/log4cplus/Makefile
index 05458cd..8f557c6 100644
--- a/package/log4cplus/Makefile
+++ b/package/log4cplus/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= log4cplus
PKG_VERSION:= 1.0.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 977d0a390b3be1a4ad8cfab2e4dd3af3
PKG_DESCR:= Logging framework for C++
PKG_SECTION:= libs
@@ -13,6 +13,7 @@ PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= libpthread
PKG_URL:= http://log4cplus.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=log4cplus/log4cplus-stable/${PKG_VERSION}/}
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -20,9 +21,9 @@ include ${TOPDIR}/mk/package.mk
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
-$(eval $(call PKG_template,LOG4CPLUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LOG4CPLUS,log4cplus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+log4cplus-install:
${CP} ${WRKINST}/* ${IDIR_LOG4CPLUS}
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
index 2f00518..14c5d54 100644
--- a/package/log4cxx/Makefile
+++ b/package/log4cxx/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= log4cxx
PKG_VERSION:= 0.10.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b30ffb8da3665178e68940ff7a61084c
PKG_DESCR:= Apache logging framework for C++
PKG_SECTION:= libs
@@ -13,30 +13,21 @@ PKG_DEPENDS:= apr apr-util
PKG_BUILDDEP:= apr apr-util
PKG_URL:= http://logging.apache.org/log4cxx/
PKG_SITES:= http://www.apache.org/dist/logging/log4cxx/0.10.0/
+PKG_OPTS:= dev
DISTFILES:= apache-${PKG_NAME}-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION}
PKG_ARCH_DEPENDS:= !cris
-PKG_SUBPKGS:= LOG4CXX LOG4CXX_DEV
-PKGSD_LOG4CXX_DEV:= log4cxx development headers
-PKGSC_LOG4CXX_DEV:= devel
-
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LOG4CXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LOG4CXX_DEV,${PKG_NAME}_dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOG4CXX_DEV},${PKGSC_LOG4CXX_DEV}))
+$(eval $(call PKG_template,LOG4CXX,log4cxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
log4cxx-install:
${INSTALL_DIR} ${IDIR_LOG4CXX}/usr/lib
- ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_LOG4CXX}/usr/lib
${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LOG4CXX}/usr/lib
-log4cxx_dev-install:
- ${INSTALL_DIR} ${IDIR_LOG4CXX_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LOG4CXX_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 981aa21..3dc4e38 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -5,21 +5,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= lvm
PKG_VERSION:= 2.02.80
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 816f4cee75674e3a21fd40f1961279f2
PKG_DESCR:= logical volume management
PKG_SECTION:= fs
PKG_DEPENDS:= libdevmapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
+PKG_LIBNAME:= libdevmapper
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER LIBDEVMAPPER_DEV
+PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER
PKGSD_DEVICE_MAPPER:= device-mapper utility
PKGSS_DEVICE_MAPPER:= libdevmapper
PKGSD_LIBDEVMAPPER:= device-mapper library
PKGSC_LIBDEVMAPPER:= libs
-PKGSD_LIBDEVMAPPER_DEV:=device-mapper headers
-PKGSC_LIBDEVMAPPER_DEV:=devel
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
@@ -28,8 +28,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER}))
-$(eval $(call PKG_template,LIBDEVMAPPER_DEV,libdevmapper-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER_DEV},${PKGSC_LIBDEVMAPPER_DEV}))
+$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER},${PKG_OPTS}))
CONFIGURE_ARGS+= --with-user="" --with-group="" \
--with-optimisation="" \
@@ -44,11 +43,6 @@ libdevmapper-install:
${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
${IDIR_LIBDEVMAPPER}/usr/lib
-libdevmapper-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBDEVMAPPER_DEV}/usr/include
-
device-mapper-install:
${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 619988c..00508ce 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -4,17 +4,15 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/mpfr/Makefile.inc
+PKG_NAME:= mpfr
PKG_DESCR:= multi precision library
PKG_SECTION:= libs
PKG_URL:= http://www.mpfr.org/
-PKG_SUBPKGS:= MPFR MPFR_DEV
-PKGSC_MPFR_DEV:= devel
-PKGSD_MPFR_DEV:= mpfr headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,MPFR_DEV,mpfr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MPFR_DEV},${PKGSC_MPFR_DEV}))
+$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -22,8 +20,4 @@ mpfr-install:
${INSTALL_DIR} ${IDIR_MPFR}/usr/lib
${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib
-mpfr-dev-install:
- ${INSTALL_DIR} ${IDIR_MPFR_DEV}/usr/include
- $(CP) $(WRKINST)/usr/include/* ${IDIR_MPFR_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/musl/Config.in.manual b/package/musl/Config.in.manual
index 19f590e..e7f0d0c 100644
--- a/package/musl/Config.in.manual
+++ b/package/musl/Config.in.manual
@@ -6,12 +6,3 @@ config ADK_PACKAGE_MUSL
depends on ADK_TARGET_LIB_MUSL
help
Embedded C library.
-
-config ADK_PACKAGE_MUSL_DEV
- prompt "musl-dev............. development files"
- tristate
- default n
- depends on ADK_TARGET_LIB_MUSL && ADK_PACKAGE_MUSL
- help
- C library header files.
-
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 2d85c94..365dea8 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mysql
PKG_VERSION:= 5.1.61
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 4efd10c69c4c99dbdb8fae3834a6d7b8
PKG_DESCR:= MySQL client library
PKG_SECTION:= db
@@ -13,14 +13,14 @@ PKG_DEPENDS:= libncurses zlib
PKG_BUILDDEP:= ncurses zlib readline
PKG_URL:= http://www.mysql.com/
PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/}
+PKG_LIBNAME:= libmysqlclient
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBMYSQLCLIENT LIBMYSQLCLIENT_DEV
PKG_HOST_DEPENDS:= !cygwin
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMYSQLCLIENT_DEV,libmysqlclient-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
@@ -91,11 +91,4 @@ libmysqlclient-install:
$(SED) "s,\(^pkgincludedir='\)\(.*\),\1${STAGING_TARGET_DIR}\2," \
${WRKINST}/usr/bin/mysql_config
-libmysqlclient-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMYSQLCLIENT_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/mysql_config \
- ${IDIR_LIBMYSQLCLIENT_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 4a2eea8..c72b4b2 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -5,24 +5,21 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ncurses
PKG_VERSION:= 5.7
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= cce05daf61a64501ef6cd8da1f727ec6
PKG_DESCR:= a terminal handling library
PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/ncurses/
PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/}
-
-PKG_SUBPKGS:= LIBNCURSES LIBNCURSES_DEV
-PKGSD_LIBNCURSES_DEV:= development files for libncurses
-PKGSC_LIBNCURSES_DEV:= devel
+PKG_LIBNAME:= libncurses
+PKG_OPTS:= dev
PKG_FLAVOURS_LIBNCURSES:= FULL_TERMINFO
PKGFD_FULL_TERMINFO:= install the complete set of terminfo files as provided upstream
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV}))
+$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS+= -lgcc
CONFIGURE_ENV+= ac_cv_linux_vers=2
@@ -86,11 +83,4 @@ else
done
endif
-libncurses-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/ncurses5-config \
- ${IDIR_LIBNCURSES_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/neon/Makefile b/package/neon/Makefile
index 6ef4685..4ceeba3 100644
--- a/package/neon/Makefile
+++ b/package/neon/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= neon
PKG_VERSION:= 0.29.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= ff369e69ef0f0143beb5626164e87ae2
PKG_DESCR:= HTTP and WebDAV library
PKG_SECTION:= libs
@@ -13,15 +13,11 @@ PKG_DEPENDS:= libpthread libxml2 libopenssl zlib
PKG_BUILDDEP:= libpthread libxml2 openssl zlib
PKG_URL:= http://webdav.org/neon/
PKG_SITES:= http://webdav.org/neon/
-
-PKG_SUBPKGS:= NEON NEON_DEV
-PKGSC_NEON_DEV:= devel
-PKGSD_NEON_DEV:= HTTP and WebDAV headers
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,NEON_DEV,neon-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_NEON_DEV},${PKGSC_NEON_DEV}))
+$(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --with-ssl=openssl \
--without-gssapi \
@@ -31,15 +27,4 @@ neon-install:
${INSTALL_DIR} ${IDIR_NEON}/usr/lib
$(CP) ${WRKINST}/usr/lib/libneon.so* ${IDIR_NEON}/usr/lib
-neon-dev-install:
- ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/include/neon
- ${INSTALL_DATA} ${WRKINST}/usr/include/neon/*.h \
- ${IDIR_NEON_DEV}/usr/include/neon
- ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/neon.pc \
- ${IDIR_NEON_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_NEON_DEV}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/neon-config \
- ${IDIR_NEON_DEV}/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 7d686e6..590b01c 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -11,19 +11,15 @@ PKG_DESCR:= Netscape Portable Runtime library
PKG_SECTION:= libs
PKG_URL:= http://www.mozilla.org/projects/nspr/
PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}/src/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !cris
-PKG_SUBPKGS:= NSPR NSPR_DEV
-PKGSC_NSPR_DEV:= devel
-PKGSD_NSPR_DEV:= nspr headers
-
WRKSRC= ${WRKDIST}/mozilla/nsprpub
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,NSPR,nspr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,NSPR_DEV,nspr-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_NSPR_DEV},${PKGSC_NSPR_DEV}))
+$(eval $(call PKG_template,NSPR,nspr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}"
@@ -35,8 +31,4 @@ nspr-install:
$(INSTALL_DIR) $(IDIR_NSPR)/usr/lib
$(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_NSPR)/usr/lib
-nspr-dev-install:
- $(INSTALL_DIR) $(IDIR_NSPR_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* $(IDIR_NSPR_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openct/Makefile b/package/openct/Makefile
index 9b3443d..627d902 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= openct
PKG_VERSION:= 0.6.20
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= a1da3358ab798f1cb9232f1dbababc21
PKG_DESCR:= drivers for smart card readers
PKG_SECTION:= crypto
@@ -13,22 +13,21 @@ PKG_DEPENDS:= libopenct
PKG_BUILDDEP:= libtool
PKG_URL:= http://www.opensc-project.org/openct/
PKG_SITES:= http://www.opensc-project.org/files/openct/
+PKG_LIBNAME:= libopenct
+PKG_OPTS:= dev
-PKG_SUBPKGS:= OPENCT LIBOPENCT LIBOPENCT_DEV
+PKG_SUBPKGS:= OPENCT LIBOPENCT
PKGSD_LIBOPENCT:= crypto token library
PKGSC_LIBOPENCT:= libs
PKGSS_LIBOPENCT:= libltdl libusb
PKGSB_LIBOPENCT:= libtool libusb
-PKGSD_LIBOPENCT_DEV:= development files for openct
-PKGSC_LIBOPENCT_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBOPENCT,libopenct,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENCT},${PKGSD_LIBOPENCT},${PKGSC_LIBOPENCT}))
-$(eval $(call PKG_template,LIBOPENCT_DEV,libopenct-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBOPENCT_DEV},${PKGSC_LIBOPENCT_DEV}))
+$(eval $(call PKG_template,LIBOPENCT,libopenct,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENCT},${PKGSD_LIBOPENCT},${PKGSC_LIBOPENCT},${PKG_OPTS}))
-post-install:
+openct-install:
${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/{sbin,bin}
${INSTALL_BIN} ${WRKINST}/usr/sbin/openct-control \
${IDIR_OPENCT}/usr/sbin
@@ -44,12 +43,4 @@ libopenct-install:
${CP} ${WRKINST}/usr/lib/libopenct.so* \
${IDIR_LIBOPENCT}/usr/lib
-libopenct-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBOPENCT_DEV}/usr/include/openct
- ${CP} ${WRKINST}/usr/include/openct/*.h \
- ${IDIR_LIBOPENCT_DEV}/usr/include/openct
- ${INSTALL_DIR} ${IDIR_LIBOPENCT_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBOPENCT_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 970cd9d..3ab75f1 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= openldap
PKG_VERSION:= 2.4.26
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f36f3086031dd56ae94f722ffae8df5e
PKG_DESCR:= OpenLDAP client libraries
PKG_SECTION:= libs
@@ -14,10 +14,10 @@ PKG_BUILDDEP:= cyrus-sasl openssl db util-linux
PKG_URL:= http://www.openldap.org/
PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libopenldap
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBOPENLDAP LIBOPENLDAP_DEV OPENLDAP_UTILS OPENLDAP_SLAPD
-PKGSD_LIBOPENLDAP_DEV:= OpenLDAP headers
-PKGSC_LIBOPENLDAP_DEV:= devel
+PKG_SUBPKGS:= LIBOPENLDAP OPENLDAP_UTILS OPENLDAP_SLAPD
PKGSD_OPENLDAP_UTILS:= OpenLDAP utilities
PKGSS_OPENLDAP_UTILS:= libopenldap
PKGSC_OPENLDAP_UTILS:= net/misc
@@ -32,8 +32,7 @@ PKGFD_WITH_IPV6:= enable IPv6 support
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBOPENLDAP_DEV,libopenldap-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOPENLDAP_DEV},${PKGSC_LIBOPENLDAP_DEV}))
+$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_UTILS},${PKGSD_OPENLDAP_UTILS},${PKGSC_OPENLDAP_UTILS}))
$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENLDAP_SLAPD},${PKGSD_OPENLDAP_SLAPD},${PKGSC_OPENLDAP_SLAPD}))
@@ -87,11 +86,6 @@ libopenldap-install:
${CP} ${WRKINST}/usr/lib/lib{lber,ldap}*.so* \
${IDIR_LIBOPENLDAP}/usr/lib
-libopenldap-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBOPENLDAP_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBOPENLDAP_DEV}/usr/include
-
openldap-utils-install:
${INSTALL_DIR} ${IDIR_OPENLDAP_UTILS}/etc/openldap-data
${INSTALL_DIR} ${IDIR_OPENLDAP_UTILS}/usr/bin
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index b1fcda2..c07d162 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= opensc
PKG_VERSION:= 0.11.13
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 98fa151e947941f9c3f27420fdf47c11
PKG_DESCR:= utilities to access smart cards
PKG_SECTION:= crypto
@@ -13,29 +13,28 @@ PKG_BUILDDEP:= openct pcsc-lite openssl readline
PKG_DEPENDS:= libopensc libopenct pcsc-lite libopenssl libreadline
PKG_URL:= http://www.opensc-project.org/opensc/
PKG_SITES:= http://www.opensc-project.org/files/opensc/
+PKG_LIBNAME:= libopensc
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32
-PKG_SUBPKGS:= OPENSC LIBOPENSC LIBOPENSC_DEV
+PKG_SUBPKGS:= OPENSC LIBOPENSC
PKGSD_LIBOPENSC:= opensc library
PKGSC_LIBOPENSC:= libs
PKGSS_LIBOPENSC:= libltdl
PKGSB_LIBOPENSC:= libtool
-PKGSD_LIBOPENSC_DEV:= development files for opensc
-PKGSC_LIBOPENSC_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENSC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBOPENSC,libopensc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSC},${PKGSD_LIBOPENSC},${PKGSC_LIBOPENSC}))
-$(eval $(call PKG_template,LIBOPENSC_DEV,libopensc-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBOPENSC_DEV},${PKGSC_LIBOPENSC_DEV}))
+$(eval $(call PKG_template,LIBOPENSC,libopensc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSC},${PKGSD_LIBOPENSC},${PKGSC_LIBOPENSC},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-man \
--disable-iconv \
--enable-pcsc \
--enable-openct
-post-install:
+opensc-install:
${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin
${INSTALL_DIR} ${IDIR_OPENSC}/usr/share/opensc
${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \
@@ -62,9 +61,4 @@ libopensc-install:
${CP} ${WRKINST}/usr/lib/opensc-pkcs11.so \
${IDIR_LIBOPENSC}/usr/lib
-libopensc-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBOPENSC_DEV}/usr/include/opensc
- ${CP} ${WRKINST}/usr/include/opensc/*.h \
- ${IDIR_LIBOPENSC_DEV}/usr/include/opensc
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 37a5642..aad1eba 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= openssl
PKG_VERSION:= 1.0.1e
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 66bf6f10f060d561929de96f9dfe5b8c
PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
PKG_SECTION:= libs
@@ -13,26 +13,24 @@ PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.openssl.org/
PKG_SITES:= http://www.openssl.org/source/
+PKG_LIBNAME:= libopenssl
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBOPENSSL LIBOPENSSL_DEV OPENSSL_UTIL
+PKG_SUBPKGS:= LIBOPENSSL OPENSSL_UTIL
PKGSD_OPENSSL_UTIL:= OpenSSL command line tool
PKGSC_OPENSSL_UTIL:= crypto
PKGSS_OPENSSL_UTIL:= libopenssl
-PKGSD_LIBOPENSSL_DEV:= development files for openssl
-PKGSC_LIBOPENSSL_DEV:= devel
-PKGSS_LIBOPENSSL_DEV:= libopenssl
PKG_FLAVOURS_LIBOPENSSL:= WITH_CRYPTODEV
PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
-$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV}))
$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL}))
CONFIG_STYLE:= manual
@@ -90,8 +88,4 @@ openssl-util-install:
${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/
chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private
-libopenssl-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBOPENSSL_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBOPENSSL_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index 3713ad4..cc8774e 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -6,24 +6,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= ORBit2
PKG_VERSION:= 2.14.19
PKG_EXTRAVER:= 2.14
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9
PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker
PKG_SECTION:= libs
PKG_BUILDDEP:= libIDL
PKG_URL:= http://projects.gnome.org/ORBit2/
PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
+PKG_LIBNAME:= orbit2
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !cris
-PKG_SUBPKGS:= ORBIT2 ORBIT2_DEV
-PKGSD_ORBIT2_DEV:= orbit2 headers
-PKGSC_ORBIT2_DEV:= devel
-
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
+$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --cflags)
LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs)
@@ -53,12 +50,4 @@ orbit2-install:
$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
$(STAGING_DIR)/usr/bin
-orbit2-dev-install:
- $(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_ORBIT2_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pango/Makefile b/package/pango/Makefile
index aae4d4d..e84d667 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pango
PKG_VERSION:= 1.28.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 22ad1c8d3fda7e73b0798035f3dd96bc
PKG_DESCR:= pango library
PKG_SECTION:= libs
@@ -13,21 +13,17 @@ PKG_BUILDDEP:= libXft glib cairo libstdcxx fontconfig
PKG_URL:= http://www.pango.org/
PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.28/}
PKG_NEED_CXX:= 1
+PKG_OPTS:= dev
#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-PKG_SUBPKGS:= PANGO PANGO_DEV
-PKGSC_PANGO_DEV:= devel
-PKGSD_PANGO_DEV:= pango headers
-
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
@@ -41,12 +37,4 @@ pango-install:
$(CP) $(WRKINST)/usr/lib/pango/1.6.0/modules/*.so \
$(IDIR_PANGO)/usr/lib/pango/1.6.0/modules
-pango-dev-install:
- $(INSTALL_DIR) $(IDIR_PANGO_DEV)/usr/include
- ${CP} $(WRKINST)/usr/include/* \
- $(IDIR_PANGO_DEV)/usr/include
- $(INSTALL_DIR) $(IDIR_PANGO_DEV)/usr/lib/pkgconfig
- ${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_PANGO_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 04b9741..339911d 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -5,24 +5,23 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pcre
PKG_VERSION:= 8.31
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fab1bb3b91a4c35398263a5c1e0858c1
PKG_DESCR:= a Perl Compatible Regular Expression library
PKG_SECTION:= libs
PKG_BUILDDEPS:= gettext-tiny
PKG_URL:= http://www.pcre.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/}
+PKG_LIBNAME:= libpcre
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBPCRE LIBPCRE_DEV LIBPCRECPP
-PKGSD_LIBPCRE_DEV:= PCRE headers
-PKGSC_LIBPCRE_DEV:= devel
+PKG_SUBPKGS:= LIBPCRE LIBPCRECPP
PKGSD_LIBPCRECPP:= PCRE c++ library
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRECPP},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRE_DEV},${PKGSC_LIBPCRE_DEV}))
XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
@@ -35,12 +34,4 @@ libpcrecpp-install:
${INSTALL_DIR} ${IDIR_LIBPCRECPP}/usr/lib
${CP} ${WRKINST}/usr/lib/libpcrecpp.so* ${IDIR_LIBPCRECPP}/usr/lib
-libpcre-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBPCRE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/*.h \
- ${IDIR_LIBPCRE_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBPCRE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBPCRE_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile
index 4d6f971..8a7f496 100644
--- a/package/pcsc-lite/Makefile
+++ b/package/pcsc-lite/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= pcsc-lite
PKG_VERSION:= 1.7.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1caf0b8ca2ecbf82fe3b035b3fff22dd
PKG_DESCR:= middleware for smartcards
PKG_SECTION:= crypto
@@ -13,23 +13,19 @@ PKG_DEPENDS:= libusb libusb-compat libpthread
PKG_BUILDDEP:= libusb libusb-compat
PKG_URL:= http://pcsclite.alioth.debian.org/
PKG_SITES:= http://alioth.debian.org/frs/download.php/file/3598/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32
-PKG_SUBPKGS:= PCSC_LITE PCSC_LITE_DEV
-PKGSD_PCSC_LITE_DEV:= header files for pcsc-lite
-PKGSC_PCSC_LITE_DEV:= devel
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PCSC_LITE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PCSC_LITE_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_PCSC_LITE_DEV},${PKGSC_PCSC_LITE_DEV}))
+$(eval $(call PKG_template,PCSC_LITE,pcsc-lite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-libudev
-post-install:
+pcsc-lite-install:
$(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d
$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin
$(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib
@@ -38,11 +34,4 @@ post-install:
$(CP) $(WRKINST)/usr/lib/libpcsclite.so* \
$(IDIR_PCSC_LITE)/usr/lib
-pcsc-lite-dev-install:
- ${INSTALL_DIR} ${IDIR_PCSC_LITE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_PCSC_LITE_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_PCSC_LITE_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_PCSC_LITE_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index a959263..5cb1821 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -5,25 +5,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= pixman
PKG_VERSION:= 0.30.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= ae7ac97921dfa59086ca2231621a79c7
PKG_DESCR:= Pixel manipulation library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libpng
PKG_SITES:= http://www.cairographics.org/releases/
-
-PKG_SUBPKGS:= PIXMAN PIXMAN_DEV
-PKGSC_PIXMAN_DEV:= devel
-PKGSD_PIXMAN_DEV:= Pixel manipulation headers
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,PIXMAN_DEV,pixman-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PIXMAN_DEV},${PKGSC_PIXMAN_DEV},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-gtk \
@@ -33,12 +29,4 @@ pixman-install:
${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib
${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib
-pixman-dev-install:
- ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_PIXMAN_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_PIXMAN_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/polarssl/Makefile b/package/polarssl/Makefile
index ade6f27..69bf76d 100644
--- a/package/polarssl/Makefile
+++ b/package/polarssl/Makefile
@@ -11,18 +11,14 @@ PKG_DESCR:= embedded SSL/TLS library
PKG_SECTION:= libs
PKG_URL:= https://polarssl.org/
PKG_SITES:= http://www.openadk.org/distfiles/
+PKG_LIBNAME:= libpolarssl
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-gpl.tgz
-PKG_SUBPKGS:= LIBPOLARSSL LIBPOLARSSL_DEV
-
include $(TOPDIR)/mk/package.mk
-PKGSD_LIBPOLARSSL_DEV:= development files for polarssl
-PKGSC_LIBPOLARSSL_DEV:= devel
-
-$(eval $(call PKG_template,LIBPOLARSSL,libpolarssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBPOLARSSL_DEV,libpolarssl-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPOLARSSL_DEV},${PKGSC_LIBPOLARSSL_DEV}))
+$(eval $(call PKG_template,LIBPOLARSSL,libpolarssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
ALL_TARGET:= no_test
@@ -32,9 +28,4 @@ libpolarssl-install:
$(CP) $(WRKINST)/usr/lib/libpolarssl.so* \
$(IDIR_LIBPOLARSSL)/usr/lib
-libpolarssl-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBPOLARSSL_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBPOLARSSL_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/popt/Makefile b/package/popt/Makefile
index a72d4de..398aeae 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= popt
PKG_VERSION:= 1.16
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33
PKG_DESCR:= a command line option parsing library
PKG_SECTION:= libs
@@ -13,27 +13,21 @@ PKG_DEPENDS:= libiconv
PKG_BUILDDEP:= libiconv
PKG_URL:= http://rpm5.org/
PKG_SITES:= http://rpm5.org/files/popt/
-
-PKG_SUBPKGS:= LIBPOPT LIBPOPT_DEV
-PKGSC_LIBPOPT_DEV:= devel
+PKG_LIBNAME:= libpopt
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBPOPT_DEV,libpopt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPOPT_DEV},${PKG_OPTS}))
TARGET_LDFLAGS+= -liconv
-post-install:
+libpopt-install:
${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib
${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib
-libpopt-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBPOPT_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPOPT_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index d3a0f51..34e75ae 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -5,20 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= postgresql
PKG_VERSION:= 9.1.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 93b293bd735bb99258c1bad7bc9b8f6c
PKG_DESCR:= PostgreSQL database library
PKG_SECTION:= db
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.postgresql.org/
PKG_SITES:= http://ftp.postgresql.org/pub/source/v9.1.1/
-
-PKG_SUBPKGS:= LIBPQ LIBPQ_DEV
+PKG_LIBNAME:= libpq
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBPQ_DEV,libpq-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
@@ -57,10 +56,7 @@ do-build:
libpq-install:
${INSTALL_DIR} ${IDIR_LIBPQ}/usr/lib
${CP} ${WRKINST}/usr/lib/libpq.so* ${IDIR_LIBPQ}/usr/lib
-
-libpq-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBPQ_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPQ_DEV}/usr/include
+ # workaround for dev subpackage
${INSTALL_DIR} ${IDIR_LIBPQ_DEV}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/pg_config \
${IDIR_LIBPQ_DEV}/usr/bin
diff --git a/package/printproto/Makefile b/package/printproto/Makefile
index 63a09d3..ed94bbd 100644
--- a/package/printproto/Makefile
+++ b/package/printproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= printproto
PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_DESCR:= X Print Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 5afeb3a7de8a14b417239a14ea724268
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PRINTPROTO,printproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_PRINTPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_PRINTPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_PRINTPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_PRINTPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile
index 4e81ad4..407f27f 100644
--- a/package/randrproto/Makefile
+++ b/package/randrproto/Makefile
@@ -8,18 +8,12 @@ PKG_VERSION:= 1.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= b8fd2f75cf156c9f6e6771addd07ef59
PKG_DESCR:= Xrandr protcol headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,RANDRPROTO,randrproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_RANDRPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RANDRPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_RANDRPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/randrproto.pc \
- ${IDIR_RANDRPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/readline/Makefile b/package/readline/Makefile
index bbd9f6c..4b18efc 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -5,22 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= readline
PKG_VERSION:= 6.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fc2f7e714fe792db1ce6ddc4c9fb4ef3
PKG_DESCR:= Command line editing library
PKG_SECTION:= libs
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_SITES:= ${MASTER_SITE_GNU:=readline/}
-
-PKG_SUBPKGS:= LIBREADLINE LIBREADLINE_DEV
-PKGSD_LIBREADLINE_DEV:= readline headers
-PKGSC_LIBREADLINE_DEV:= devel
+PKG_LIBNAME:= libreadline
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBREADLINE_DEV,libreadline-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBREADLINE_DEV},${PKGSC_LIBREADLINE_DEV}))
+$(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --with-curses
@@ -29,9 +26,4 @@ libreadline-install:
${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib
${CP} ${WRKINST}/usr/lib/libreadline.so* ${IDIR_LIBREADLINE}/usr/lib
-libreadline-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBREADLINE_DEV}/usr/include/readline
- ${CP} ${WRKINST}/usr/include/readline/*.h \
- ${IDIR_LIBREADLINE_DEV}/usr/include/readline
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/recordproto/Makefile b/package/recordproto/Makefile
index 62e5c7c..e9d7f68 100644
--- a/package/recordproto/Makefile
+++ b/package/recordproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= recordproto
PKG_VERSION:= 1.14.2
PKG_RELEASE:= 1
PKG_DESCR:= RECORD extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 868235e1e150e68916d5a316ebc4ccc4
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_RECORDPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RECORDPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_RECORDPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/recordproto.pc \
- ${IDIR_RECORDPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile
index 0bb5390..3f744da 100644
--- a/package/renderproto/Makefile
+++ b/package/renderproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= renderproto
PKG_VERSION:= 0.11.1
PKG_RELEASE:= 1
PKG_DESCR:= X Rendering Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 9b103359123e375bb7760f7dbae3dece
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,RENDERPROTO,renderproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_RENDERPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RENDERPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_RENDERPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/renderproto.pc \
- ${IDIR_RENDERPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile
index 52273d3..91e1cb7 100644
--- a/package/resourceproto/Makefile
+++ b/package/resourceproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= resourceproto
PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
PKG_DESCR:= Resource extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 33091d5358ec32dd7562a1aa225a70aa
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,RESOURCEPROTO,resourceproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_RESOURCEPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_RESOURCEPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_RESOURCEPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/resourceproto.pc \
- ${IDIR_RESOURCEPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile
index 6091c96..56b2e83 100644
--- a/package/scrnsaverproto/Makefile
+++ b/package/scrnsaverproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= scrnsaverproto
PKG_VERSION:= 1.2.2
PKG_RELEASE:= 1
PKG_DESCR:= X11 screensaver headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 21704f1bad472d94abd22fea5704bb48
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,SCRNSAVERPROTO,scrnsaverproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_SCRNSAVERPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_SCRNSAVERPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_SCRNSAVERPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/scrnsaverproto.pc \
- ${IDIR_SCRNSAVERPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index 00f5b5a..b8968bd 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= sdl-image
PKG_VERSION:= 1.2.10
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
@@ -14,20 +14,17 @@ PKG_BUILDDEP:= libpng libtiff jpeg sdl
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libsdl-image
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
-PKG_SUBPKGS:= LIBSDL_IMAGE LIBSDL_IMAGE_DEV
-PKGSD_LIBSDL_IMAGE_DEV:=development files for sdlimage
-PKGSC_LIBSDL_IMAGE_DEV:=devel
-
DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKGSD_LIBSDL_IMAGE_DEV},${PKGSC_LIBSDL_IMAGE_DEV}))
+$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-png \
--enable-jpg \
@@ -38,12 +35,4 @@ libsdl-image-install:
$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
-libsdl-image-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
- $(CP) ${WRKINST}/usr/include/SDL/*.h \
- $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
- $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBSDL_IMAGE_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index d08555c..08e47ea 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= sdl
PKG_VERSION:= 1.2.14
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
@@ -13,6 +13,8 @@ PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext
PKG_BUILDDEP:= libusb alsa-lib libX11 libXext
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/release/
+PKG_LIBNAME:= libsdl
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
@@ -21,17 +23,12 @@ PKGFD_WITH_TSLIB:= enable touchscreen support
PKGFS_WITH_TSLIB:= tslib
PKGFB_WITH_TSLIB:= tslib
-PKG_SUBPKGS:= LIBSDL LIBSDL_DEV
-PKGSD_LIBSDL_DEV:= development files for libsdl
-PKGSC_LIBSDL_DEV:= devel
-
DISTFILES:= SDL-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV}))
+$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y)
CONFIGURE_ARGS+= --enable-input-tslib
@@ -50,13 +47,4 @@ libsdl-install:
$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
-libsdl-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/sdl-config \
- $(IDIR_LIBSDL_DEV)/usr/bin
- $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/include/SDL
- $(CP) ${WRKINST}/usr/include/SDL/* $(IDIR_LIBSDL_DEV)/usr/include/SDL
- $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/lib/pkgconfig
- $(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc $(IDIR_LIBSDL_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/section.lst b/package/section.lst
index 7fc2667..6c501d5 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -46,4 +46,3 @@ x11/server X server
x11/libs X libraries
x11/misc X misc
x11/fonts X fonts
-x11/devel X headers
diff --git a/package/sysfsutils/Makefile b/package/sysfsutils/Makefile
index dd43846..370f2b9 100644
--- a/package/sysfsutils/Makefile
+++ b/package/sysfsutils/Makefile
@@ -5,22 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= sysfsutils
PKG_VERSION:= 2.1.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 14e7dcd0436d2f49aa403f67e1ef7ddc
PKG_DESCR:= utilites built upon sysfs
PKG_SECTION:= utils
PKG_URL:= http://linux-diag.sourceforge.net/Sysfsutils.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-diag/sysfsutils/2.1.0/}
-
-PKG_SUBPKGS:= SYSFSUTILS SYSFSUTILS_DEV
-PKGSC_SYSFSUTILS_DEV:= devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SYSFSUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SYSFSUTILS_DEV,sysfsutils-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_SYSFSUTILS_DEV}))
+$(eval $(call PKG_template,SYSFSUTILS,sysfsutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+sysfsutils-install:
$(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/bin
$(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/lib
$(CP) $(WRKINST)/usr/lib/libsysfs.so* \
@@ -28,9 +25,4 @@ post-install:
$(INSTALL_BIN) $(WRKINST)/usr/bin/systool \
$(IDIR_SYSFSUTILS)/usr/bin
-sysfsutils-dev-install:
- $(INSTALL_DIR) $(IDIR_SYSFSUTILS_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_SYSFSUTILS_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
index 6afaf2b..bf8021d 100644
--- a/package/uclibc/Config.in.manual
+++ b/package/uclibc/Config.in.manual
@@ -6,12 +6,3 @@ config ADK_PACKAGE_UCLIBC
depends on ADK_TARGET_LIB_UCLIBC
help
Embedded C library.
-
-config ADK_PACKAGE_UCLIBC_DEV
- prompt "uClibc-dev............. development files"
- tristate
- default n
- depends on ADK_TARGET_LIB_UCLIBC && ADK_PACKAGE_UCLIBC
- help
- C library header files.
-
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 2f84a4d..a95e109 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -5,32 +5,35 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= util-linux
PKG_VERSION:= 2.23.2
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= b39fde897334a4858bb2098edcce5b3f
-PKG_DESCR:= Linux utilities
-PKG_SECTION:= fs
+PKG_DESCR:= Linux utilities (meta-package)
+PKG_SECTION:= utils
+PKG_DEPENDS:= mount fdisk sfdisk swap-utils losetup mount mcookie
PKG_BUILDDEP:= ncurses
PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.23/
PKG_NOPARALLEL:= 1
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
-PKG_SUBPKGS+= LIBUUID LIBBLKID LIBUUID_DEV LIBMOUNT
+PKG_SUBPKGS:= UTIL_LINUX FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
+PKG_SUBPKGS+= LIBUUID LIBBLKID LIBMOUNT
PKGSD_LIBUUID:= UUID library
PKGSC_LIBUUID:= libs
-PKGSD_LIBUUID_DEV:= UUID headers
-PKGSC_LIBUUID_DEV:= devel
PKGSD_LIBBLKID:= BLKID library
PKGSC_LIBBLKID:= libs
PKGSD_LIBMOUNT:= Mount library
PKGSC_LIBMOUNT:= libs
PKGSD_FDISK:= Partition table manipulation utility
+PKGSC_FDISK:= fs
PKGSD_SFDISK:= Scriptable Partition table manipulation utility
+PKGSC_SFDISK:= fs
PKGSD_SWAP_UTILS:= Swap space management utilities
PKGSS_SWAP_UTILS:= libblkid
+PKGSC_SWAP_UTILS:= fs
PKGSD_LOSETUP:= Loop devices management utilities
PKGSS_LOSETUP:= kmod-blk-dev-loop
PKGSD_MOUNT:= mount/umount utilities
@@ -41,14 +44,14 @@ PKGSC_MCOOKIE:= x11/apps
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKG_SECTION}))
-$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKG_SECTION}))
-$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKG_SECTION}))
+$(eval $(call PKG_template,UTIL_LINUX,util-linux,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKGSC_FDISK}))
+$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKGSC_SFDISK}))
+$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKGSC_SWAP_UTILS}))
$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION}))
-$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKG_SECTION}))
+$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT}))
$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE}))
$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
-$(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV}))
$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
$(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT}))
@@ -68,10 +71,7 @@ CONFIGURE_ARGS+= --disable-use-tty-group \
FAKE_FLAGS+= INSTALLSUID="install -m 4755"
TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
-post-build:
- ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid
- ${CP} ${WRKBUILD}/libuuid/src/uuid.h \
- ${STAGING_DIR}/usr/include/uuid
+util-linux-install:
fdisk-install:
${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
@@ -102,10 +102,6 @@ libuuid-install:
${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib
${CP} ${WRKINST}/usr/lib/libuuid.so* ${IDIR_LIBUUID}/usr/lib
-libuuid-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUUID_DEV}/usr/include
-
libblkid-install:
${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
${CP} ${WRKINST}/usr/lib/libblkid.so* ${IDIR_LIBBLKID}/usr/lib
diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile
index 3c16b7e..cf46623 100644
--- a/package/videoproto/Makefile
+++ b/package/videoproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= videoproto
PKG_VERSION:= 2.3.1
PKG_RELEASE:= 1
PKG_DESCR:= X11 video protocol headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= f1903057310c6b308edf0e982d33714d
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,VIDEOPROTO,videoproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_VIDEOPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_VIDEOPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_VIDEOPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/videoproto.pc \
- ${IDIR_VIDEOPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 56b3db6..8a070c4 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -7,36 +7,31 @@ PKG_NAME:= xcb-proto
PKG_VERSION:= 1.6
PKG_RELEASE:= 1
PKG_DESCR:= XML-XCB protocol descriptions
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_BUILDDEP:= python2
PKG_MD5SUM:= 8d29695e8faf5fcdce568c66eaeaa5ee
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON
+PKGSC_XCB_PYTHON:= x11/misc
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PROTO}))
include $(TOPDIR)/mk/python.mk
CONFIGURE_ENV+= PYTHON=$(PYTHON)
-post-install:
+xcb-proto-install:
${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
$(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb
${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \
${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
-xcb-proto-install:
- ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
- ${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share
- ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xcb-proto.pc \
- ${IDIR_XCB_PROTO}/usr/lib/pkgconfig
-
xcb-python-install:
${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \
diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile
index 4121d8a..aec878f 100644
--- a/package/xcmiscproto/Makefile
+++ b/package/xcmiscproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= xcmiscproto
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_DESCR:= XC-MISC Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 9a8da85301db41e8435099ffefb4ac74
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XCMISCPROTO,xcmiscproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XCMISCPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XCMISCPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_XCMISCPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xcmiscproto.pc \
- ${IDIR_XCMISCPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile
index 4177590..2217320 100644
--- a/package/xextproto/Makefile
+++ b/package/xextproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= xextproto
PKG_VERSION:= 7.2.1
PKG_RELEASE:= 1
PKG_DESCR:= X Protocol Extensions headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 9062d689f422fad1b8774c967d730f09
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XEXTPROTO,xextproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XEXTPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XEXTPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_XEXTPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xextproto.pc \
- ${IDIR_XEXTPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile
index 05a2ed6..ddfd526 100644
--- a/package/xf86dgaproto/Makefile
+++ b/package/xf86dgaproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= xf86dgaproto
PKG_VERSION:= 2.1
PKG_RELEASE:= 1
PKG_DESCR:= XFree86-DGA headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 1fe79dc07857ad3e1fb8b8f2bdd70d1b
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XF86DGAPROTO,xf86dgaproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XF86DGAPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XF86DGAPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_XF86DGAPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xf86dgaproto.pc \
- ${IDIR_XF86DGAPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86driproto/Makefile b/package/xf86driproto/Makefile
index e61a4fa..2b31bfc 100644
--- a/package/xf86driproto/Makefile
+++ b/package/xf86driproto/Makefile
@@ -7,9 +7,10 @@ PKG_NAME:= xf86driproto
PKG_VERSION:= 2.1.0
PKG_RELEASE:= 1
PKG_DESCR:= X DRI Protocol headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 309d552732666c3333d7dc63e80d042f
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -17,12 +18,4 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XF86DRIPROTO,xf86driproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XF86DRIPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_XF86DRIPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_XF86DRIPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xf86driproto.pc \
- ${IDIR_XF86DRIPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile
index 5dc9395..43df18f 100644
--- a/package/xf86vidmodeproto/Makefile
+++ b/package/xf86vidmodeproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= xf86vidmodeproto
PKG_VERSION:= 2.3.1
PKG_RELEASE:= 1
PKG_DESCR:= XFree86-VidModeExtension extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 99016d0fe355bae0bb23ce00fb4d4a2c
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XF86VIDMODEPROTO,xf86vidmodeproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XF86VIDMODEPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XF86VIDMODEPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_XF86VIDMODEPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xf86vidmodeproto.pc \
- ${IDIR_XF86VIDMODEPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xineramaproto/Makefile b/package/xineramaproto/Makefile
index c1b7588..6454275 100644
--- a/package/xineramaproto/Makefile
+++ b/package/xineramaproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= xineramaproto
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_DESCR:= Xinerama Extension headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= e0e148b11739e144a546b8a051b17dde
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XINERAMAPROTO,xineramaproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XINERAMAPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XINERAMAPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_XINERAMAPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_XINERAMAPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 2f172e6..348a144 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
PKG_VERSION:= 1.12.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a95c896fbe8322c3c8d518a13eb74c7a
PKG_DESCR:= Xorg server
PKG_SECTION:= x11/server
@@ -20,10 +20,7 @@ PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
-
-PKG_SUBPKGS:= XORG_SERVER XORG_SERVER_DEV
-PKGSD_XORG_SERVER_DEV:= Xorg server development files
-PKGSC_XORG_SERVER_DEV:= x11/devel
+PKG_OPTS:= dev
PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
PKG_ARCH_DEPENDS:= !cris !avr32
@@ -44,8 +41,7 @@ PKGCB_WITH_CRYPTO:= openssl
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XORG_SERVER_DEV},${PKGSC_XORG_SERVER_DEV}))
+$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
CONFIGURE_ARGS+= --with-sha1=libgcrypt
@@ -124,12 +120,4 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
endif
-xorg-server-dev-install:
- $(INSTALL_DIR) $(IDIR_XORG_SERVER_DEV)/usr/include/xorg
- ${CP} ${WRKINST}/usr/include/xorg/* \
- $(IDIR_XORG_SERVER_DEV)/usr/include/xorg
- $(INSTALL_DIR) $(IDIR_XORG_SERVER_DEV)/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/xorg-server.pc \
- $(IDIR_XORG_SERVER_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index 8d59c1f..3113ded 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -7,19 +7,13 @@ PKG_NAME:= xproto
PKG_VERSION:= 7.0.23
PKG_RELEASE:= 1
PKG_DESCR:= X Window System Core Protocol headers
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= 7ab1239930563a352cb3552fd2db4140
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XPROTO}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XPROTO}/usr/include
- ${INSTALL_DIR} ${IDIR_XPROTO}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xproto.pc \
- ${IDIR_XPROTO}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index 7f23582..c19ad33 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -7,9 +7,10 @@ PKG_NAME:= xtrans
PKG_VERSION:= 1.2.6
PKG_RELEASE:= 1
PKG_DESCR:= X11 network protocol transport library
-PKG_SECTION:= x11/devel
+PKG_SECTION:= devel
PKG_MD5SUM:= b91dd22b77a350d129a81175cd8c58cc
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
@@ -17,11 +18,4 @@ $(eval $(call PKG_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
CONFIGURE_ARGS+= --datadir=/usr/lib
-post-install:
- ${INSTALL_DIR} ${IDIR_XTRANS}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XTRANS}/usr/include
- ${INSTALL_DIR} ${IDIR_XTRANS}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xtrans.pc \
- ${IDIR_XTRANS}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index ffd2985..1d1c0d5 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -5,27 +5,23 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= zlib
PKG_VERSION:= 1.2.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2ab442d169156f34c379c968f3f482dd
PKG_DESCR:= implementation of the deflate compression method
PKG_SECTION:= libs
PKG_URL:= http://www.zlib.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/zlib/}
-
-PKG_SUBPKGS:= ZLIB ZLIB_DEV
-PKGSD_ZLIB_DEV:= development files for zlib
-PKGSC_ZLIB_DEV:= devel
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZLIB_DEV},${PKGSC_ZLIB_DEV}))
+$(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
CONFIGURE_ENV+= uname=Linux
@@ -51,12 +47,8 @@ do-configure:
$(CONFIGURE_OPTS) \
);
-post-install:
+zlib-install:
${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
- ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib
-
-zlib-dev-install:
- ${INSTALL_DIR} ${IDIR_ZLIB_DEV}/usr/include
- ${CP} ${WRKBUILD}/*.h ${IDIR_ZLIB_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/lib/libz.so* ${IDIR_ZLIB}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/scripts/make-ipkg-dir.sh b/scripts/make-ipkg-dir.sh
index 857076f..65eeb56 100644
--- a/scripts/make-ipkg-dir.sh
+++ b/scripts/make-ipkg-dir.sh
@@ -1,4 +1,4 @@
-BASE=http://www.openadk.org
+BASE=http://www.openadk.org/distfiles
TARGET=$1
CONTROL=$2
VERSION=$3
@@ -14,7 +14,7 @@ grep '^Priority' "$CONTROL" 2>&1 >/dev/null || \
echo "Priority: optional" >> "$TARGET/CONTROL/control"
grep '^Source' "$CONTROL" 2>&1 >/dev/null || {
pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g")
- [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase"
+ [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE"
echo "Source: $src" >> "$TARGET/CONTROL/control"
}
echo "Version: $VERSION" >> "$TARGET/CONTROL/control"
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index 2be187a..498709d 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -1,7 +1,7 @@
/*
* pkgmaker - create package meta-data for OpenADK buildsystem
*
- * Copyright (C) 2010,2011 Waldemar Brodkorb <wbx@openadk.org>
+ * Copyright (C) 2010-2013 Waldemar Brodkorb <wbx@openadk.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -158,11 +158,11 @@ static int parse_var_with_pkg(char *buf, const char *varname, char *pvalue, char
return(1);
}
-/*
+#if 0
static void iter_debug(const char *key, const char *value, const void *obj) {
fprintf(stderr, "HASHMAP key: %s value: %s\n", key, value);
}
-*/
+#endif
static int hash_str(char *string) {
@@ -272,7 +272,7 @@ int main() {
char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi;
char *pkg_need_cxx, *pkg_need_java, *pkgname;
char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
- char *packages, *pkg_name_u, *pkgs;
+ char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
char *saveptr, *p_ptr, *s_ptr, *pkg_helper;
int result;
StrMap *pkgmap, *sectionmap;
@@ -282,6 +282,8 @@ int main() {
pkg_section = NULL;
pkg_url = NULL;
pkg_depends = NULL;
+ pkg_opts = NULL;
+ pkg_libname = NULL;
pkg_flavours = NULL;
pkg_flavours_string = NULL;
pkg_choices = NULL;
@@ -323,9 +325,48 @@ int main() {
if (mkdir("package/pkgconfigs.d", S_IRWXU) > 0)
fatal_error("creation of package/pkgconfigs.d failed.");
+ if (mkdir("package/pkgconfigs.d/gcc", S_IRWXU) > 0)
+ fatal_error("creation of package/pkgconfigs.d/gcc failed.");
if (mkdir("package/pkglist.d", S_IRWXU) > 0)
fatal_error("creation of package/pkglist.d failed.");
+ /* delete Config.in.dev */
+ if (snprintf(path, MAXPATH, "package/pkgconfigs.d/gcc/Config.in.dev") < 0)
+ fatal_error("failed to create path variable.");
+ unlink(path);
+ cfg = fopen(path, "w");
+ if (cfg == NULL)
+ fatal_error("Config.in.dev can not be opened");
+ fprintf(cfg, "config ADK_PACKAGE_GLIBC_DEV\n");
+ fprintf(cfg, "\tprompt \"glibc-dev............ development files for glibc\"\n");
+ fprintf(cfg, "\ttristate\n");
+ fprintf(cfg, "\tdefault n\n");
+ fprintf(cfg, "\tdepends on ADK_TARGET_LIB_GLIBC\n");
+ fprintf(cfg, "\thelp\n");
+ fprintf(cfg, "\t GNU C library header files.\n\n");
+ fprintf(cfg, "config ADK_PACKAGE_EGLIBC_DEV\n");
+ fprintf(cfg, "\tprompt \"eglibc-dev........... development files for eglibc\"\n");
+ fprintf(cfg, "\ttristate\n");
+ fprintf(cfg, "\tdefault n\n");
+ fprintf(cfg, "\tdepends on ADK_TARGET_LIB_EGLIBC\n");
+ fprintf(cfg, "\thelp\n");
+ fprintf(cfg, "\t GNU C library header files.\n\n");
+ fprintf(cfg, "config ADK_PACKAGE_UCLIBC_DEV\n");
+ fprintf(cfg, "\tprompt \"uclibc-dev........... development files for uclibc\"\n");
+ fprintf(cfg, "\ttristate\n");
+ fprintf(cfg, "\tdefault n\n");
+ fprintf(cfg, "\tdepends on ADK_TARGET_LIB_UCLIBC\n");
+ fprintf(cfg, "\thelp\n");
+ fprintf(cfg, "\t C library header files.\n\n");
+ fprintf(cfg, "config ADK_PACKAGE_MUSL_DEV\n");
+ fprintf(cfg, "\tprompt \"musl-dev............. development files for musl\"\n");
+ fprintf(cfg, "\ttristate\n");
+ fprintf(cfg, "\tdefault n\n");
+ fprintf(cfg, "\tdepends on ADK_TARGET_LIB_MUSL\n");
+ fprintf(cfg, "\thelp\n");
+ fprintf(cfg, "\t C library header files.\n\n");
+ fclose(cfg);
+
/* read Makefile's for all packages */
pkgdir = opendir("package");
while ((pkgdirp = readdir(pkgdir)) != NULL) {
@@ -372,6 +413,7 @@ int main() {
if (mkdir(dir, S_IRWXU) > 0)
fatal_error("can not create directory.");
+
/* allocate memory */
hkey = malloc(MAXVAR);
memset(hkey, 0, MAXVAR);
@@ -420,6 +462,10 @@ int main() {
continue;
if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0)
continue;
+ if ((parse_var(buf, "PKG_LIBNAME", pkg_libname, &pkg_libname)) == 0)
+ continue;
+ if ((parse_var(buf, "PKG_OPTS", pkg_opts, &pkg_opts)) == 0)
+ continue;
if ((parse_var_with_pkg(buf, "PKG_FLAVOURS_STRING_", pkg_flavours_string, &pkg_flavours_string, &pkgname, 20)) == 0)
continue;
if ((parse_var_with_pkg(buf, "PKG_FLAVOURS_", pkg_flavours, &pkg_flavours, &pkgname, 13)) == 0)
@@ -476,6 +522,8 @@ int main() {
fprintf(stderr, "Package cfline is %s\n", pkg_cfline);
if (pkg_multi != NULL)
fprintf(stderr, "Package multi is %s\n", pkg_multi);
+ if (pkg_opts != NULL)
+ fprintf(stderr, "Package options are %s\n", pkg_opts);
strmap_enum(pkgmap, iter_debug, NULL);
#endif
@@ -518,6 +566,7 @@ int main() {
fclose(cfg);
free(pkgs);
+
/* skip packages without binary package output */
if (nobinpkgs == 1)
continue;
@@ -579,7 +628,17 @@ int main() {
fprintf(cfg, "depends on !ADK_TOOLCHAIN_GCC_CXX\n\n");
}
fprintf(cfg, "config ADK_PACKAGE_%s\n", toupperstr(token));
- fprintf(cfg, "\tprompt \"%s. %s\"\n", pseudo_name, pkg_descr);
+ /* no prompt for devonly packages */
+ if (pkg_opts != NULL) {
+ if (strstr(pkg_opts, "devonly") != NULL) {
+ fprintf(cfg, "\t#prompt \"%s. %s\"\n", pseudo_name, pkg_descr);
+ } else {
+ fprintf(cfg, "\tprompt \"%s. %s\"\n", pseudo_name, pkg_descr);
+ }
+ } else {
+ fprintf(cfg, "\tprompt \"%s. %s\"\n", pseudo_name, pkg_descr);
+ }
+
fprintf(cfg, "\ttristate\n");
if (pkg_multi != NULL)
if (strncmp(pkg_multi, "1", 1) == 0)
@@ -911,8 +970,43 @@ int main() {
free(pkg_choices);
pkg_choices = NULL;
}
- /* close file descriptor, parse next package */
+ /* close file descriptor for Config.in file */
fclose(cfg);
+ /* create Config.in files for development packages */
+ if (pkg_opts != NULL) {
+ if (strstr(pkg_opts, "dev") != NULL) {
+ if (snprintf(path, MAXPATH, "package/pkgconfigs.d/gcc/Config.in.dev") < 0)
+ fatal_error("failed to create path variable.");
+ cfg = fopen(path, "a");
+ if (cfg == NULL)
+ perror("Can not open Config.in.dev file");
+
+ if (pkg_libname == NULL)
+ pkg_libname = strdup(pkg_name);
+
+ fprintf(cfg, "\n");
+ fprintf(cfg, "config ADK_PACKAGE_%s_DEV\n", toupperstr(pkg_libname));
+
+ pseudo_name = malloc(MAXLINE);
+ memset(pseudo_name, 0, MAXLINE);
+ strncat(pseudo_name, pkg_libname, strlen(pkg_libname));
+ strncat(pseudo_name, "-dev", 4);
+ while (strlen(pseudo_name) < 20)
+ strncat(pseudo_name, ".", 1);
+
+ fprintf(cfg, "\tprompt \"%s. development files for %s\"\n", pseudo_name, pkg_libname);
+ fprintf(cfg, "\ttristate\n");
+ fprintf(cfg, "\tdepends on ADK_PACKAGE_GCC\n");
+ fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(pkg_libname));
+ fprintf(cfg, "\tdefault n\n");
+ fclose(cfg);
+ free(pseudo_name);
+ free(pkg_libname);
+ pkg_libname = NULL;
+ }
+ pkg_opts = NULL;
+ }
+ /* parse next package */
token = strtok_r(NULL, " ", &p_ptr);
}
@@ -964,6 +1058,17 @@ int main() {
}
}
+ /* add menu to gcc package */
+ if (snprintf(path, MAXPATH, "package/pkgconfigs.d/gcc/Config.in.gcc") < 0)
+ fatal_error("failed to create path variable.");
+ cfg = fopen(path, "a");
+ if (cfg == NULL)
+ perror("Can not open Config.in.gcc file");
+ fprintf(cfg, "menu \"Development packages\"\n");
+ fprintf(cfg, "depends on ADK_PACKAGE_GCC\n");
+ fprintf(cfg, "source \"package/pkgconfigs.d/gcc/Config.in.dev\"\n");
+ fprintf(cfg, "endmenu\n");
+ fclose(cfg);
/* create Config.in.auto */
strmap_enum(sectionmap, iter, NULL);