diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/pptp | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/pptp')
| -rw-r--r-- | package/pptp/Makefile | 7 | ||||
| -rw-r--r-- | package/pptp/files/pptp.conffiles (renamed from package/pptp/ipkg/pptp.conffiles) | 0 | ||||
| -rw-r--r-- | package/pptp/ipkg/pptp.control | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 41ac8243d..8c892d1d8 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= pptp PKG_VERSION:= 1.6.0 PKG_RELEASE:= 3 PKG_MD5SUM:= 9a706327fb9827541d7c86d48ceb9631 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} +PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) client +PKG_SECTION:= net +PKG_DEPENDS:= ppp kmod-gre +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PPTP,pptp,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto MAKE_FLAGS+= CC="${TARGET_CC}" \ diff --git a/package/pptp/ipkg/pptp.conffiles b/package/pptp/files/pptp.conffiles index 136db31f1..136db31f1 100644 --- a/package/pptp/ipkg/pptp.conffiles +++ b/package/pptp/files/pptp.conffiles diff --git a/package/pptp/ipkg/pptp.control b/package/pptp/ipkg/pptp.control deleted file mode 100644 index e582c6221..000000000 --- a/package/pptp/ipkg/pptp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pptp -Priority: optional -Section: net -Description: a Point-to-Point Tunneling Protocol (PPTP) client -Depends: ppp, kmod-gre |