summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/cxxtools/Makefile4
-rw-r--r--package/cyrus-sasl/Makefile4
-rw-r--r--package/flex/Makefile4
-rw-r--r--package/gdbm/Makefile4
-rw-r--r--package/gmp/Makefile4
-rw-r--r--package/libXaw/Makefile4
-rw-r--r--package/libXdamage/Makefile4
-rw-r--r--package/libXfixes/Makefile4
-rw-r--r--package/libgd/Makefile4
-rw-r--r--package/libnetfilter_conntrack/Makefile3
-rw-r--r--package/libnfnetlink/Makefile4
-rw-r--r--package/libupnp/Makefile4
-rw-r--r--package/openldap/Makefile4
-rw-r--r--package/pcre/Makefile5
14 files changed, 41 insertions, 15 deletions
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index f89ea6ff6..812d17ea2 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= cxxtools
PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af
-PKG_DESCR:= a collection of general-purpose C++ classes
+PKG_DESCR:= a collection of general-purpose C++ classes (libraries)
PKG_SECTION:= libs
PKG_DEPENDS:= libiconv
PKG_BUILDDEP:= libiconv
@@ -16,6 +16,8 @@ PKG_SITES:= http://www.tntnet.org/download/
PKG_NEED_CXX:= 1
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
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 5a5dcfd4a..c914941e9 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -16,11 +16,13 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSASL2_DEV,libsasl2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSASL2_DEV},${PKGSC_LIBSASL2_DEV}))
CONFIGURE_ARGS+= --disable-sample \
--enable-staticdlopen \
diff --git a/package/flex/Makefile b/package/flex/Makefile
index d2ca5ee34..bd7bc73f4 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -13,11 +13,13 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FLEX_DEV,flex-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FLEX_DEV},${PKGSC_FLEX_DEV}))
flex-install:
${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index 7f4283e70..bd6c369ee 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -13,11 +13,13 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGDBM_DEV,libgdbm-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGDBM_DEV},${PKGSC_LIBGDBM_DEV}))
XAKE_FLAGS+= BINOWN=`id -u` \
BINGRP=`id -g` \
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 11167df10..b9c627cef 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -9,11 +9,13 @@ PKG_SECTION:= libs
PKG_URL:= http://gmplib.org/
PKG_SUBPKGS:= LIBGMP LIBGMP_DEV
+PKGSC_LIBGMP_DEV:= devel
+PKGSD_LIBGMP_DEV:= libgmp headers
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGMP_DEV,libgmp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGMP_DEV},${PKGSC_LIBGMP_DEV}))
libgmp-install:
${INSTALL_DIR} ${IDIR_LIBGMP}/usr/lib
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index d4211c992..160c9887f 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -13,11 +13,13 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXAW_DEV,libxaw-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAW_DEV},${PKGSC_LIBXAW_DEV}))
libxaw-install:
${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
index aff71cd56..78989868c 100644
--- a/package/libXdamage/Makefile
+++ b/package/libXdamage/Makefile
@@ -13,11 +13,13 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXDAMAGE_DEV,libxdamage-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDAMAGE_DEV},${PKGSC_LIBXDAMAGE_DEV}))
libxdamage-install:
$(INSTALL_DIR) $(IDIR_LIBXDAMAGE)/usr/lib
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
index 9a6f5b308..f98ab84ae 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -14,11 +14,13 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXFIXES_DEV,libxfixes-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFIXES_DEV},${PKGSC_LIBXFIXES_DEV}))
libxfixes-install:
$(INSTALL_DIR) $(IDIR_LIBXFIXES)/usr/lib
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index dbfafd2dd..f291c70cf 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -15,11 +15,13 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGD_DEV,libgd-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGD_DEV},${PKGSC_LIBGD_DEV}))
CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_TARGET_DIR}/usr/bin/libpng12-config"
CONFIGURE_ARGS+= --without-x \
diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile
index f298a3486..21da7747b 100644
--- a/package/libnetfilter_conntrack/Makefile
+++ b/package/libnetfilter_conntrack/Makefile
@@ -15,13 +15,14 @@ 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
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},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK_DEV,libnetfilter-conntrack-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBNETFILTER_CONNTRACK_DEV}))
libnetfilter-conntrack-install:
$(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index 3cffa3e19..33f382192 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -13,13 +13,15 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNFNETLINK_DEV,libnfnetlink-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNFNETLINK_DEV},${PKGSC_LIBNFNETLINK_DEV}))
libnfnetlink-install:
$(INSTALL_DIR) $(IDIR_LIBNFNETLINK)/usr/lib
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 98f9aca9b..3726fd926 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -14,13 +14,15 @@ 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
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},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBUPNP_DEV,libupnp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUPNP_DEV},${PKGSC_LIBUPNP_DEV}))
TARGET_CFLAGS+= -fPIC
CONFIGURE_ARGS+= --disable-samples
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index d97989ce2..813c57eec 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -16,6 +16,8 @@ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
PKG_NEED_CXX:= 1
PKG_SUBPKGS:= LIBOPENLDAP LIBOPENLDAP_DEV OPENLDAP_UTILS OPENLDAP_SLAPD
+PKGSD_LIBOPENLDAP_DEV:= OpenLDAP headers
+PKGSC_LIBOPENLDAP_DEV:= devel
PKGSD_OPENLDAP_UTILS:= OpenLDAP utilities
PKGSS_OPENLDAP_UTILS:= libopenldap
PKGSC_OPENLDAP_UTILS:= net/misc
@@ -31,7 +33,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},${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,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}))
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 5bf61fae9..da4403f77 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -13,6 +13,8 @@ PKG_URL:= http://www.pcre.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/}
PKG_SUBPKGS:= LIBPCRE LIBPCRE_DEV
+PKGSD_LIBPCRE_DEV:= PCRE headers
+PKGSC_LIBPCRE_DEV:= devel
include ${TOPDIR}/mk/package.mk
@@ -24,7 +26,7 @@ XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
libpcre-install:
${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libpcre{,posix}.so* ${IDIR_LIBPCRE}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libpcre{,posix}.so* ${IDIR_LIBPCRE}/usr/lib
libpcre-dev-install:
${INSTALL_DIR} ${IDIR_LIBPCRE_DEV}/usr/include
@@ -34,5 +36,4 @@ libpcre-dev-install:
${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
${IDIR_LIBPCRE_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk