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/vpnc | |
| 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/vpnc')
| -rw-r--r-- | package/vpnc/Makefile | 10 | ||||
| -rw-r--r-- | package/vpnc/files/vpnc.conffiles (renamed from package/vpnc/ipkg/vpnc.conffiles) | 0 | ||||
| -rwxr-xr-x | package/vpnc/ipkg/vpnc.control | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index e4eab95b5..dea887dd8 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -9,14 +9,15 @@ PKG_NAME:= vpnc PKG_VERSION:= 0.4.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 604807e7dd90fce00a4e2344ee29c76d - -MASTER_SITES:= http://www.unix-ag.uni-kl.de/~massar/vpnc/ - +PKG_DESCR:= client for cisco3000 VPN Concentrator. +PKG_SECTION:= net PKG_DEPENDS:= libgcrypt libgpg-error kmod-tun +PKG_URL:= http://www.unix-ag.uni-kl.de/~massar/vpnc/ +PKG_SITES:= http://www.unix-ag.uni-kl.de/~massar/vpnc/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto XAKE_FLAGS+= CC="${TARGET_CC}" \ @@ -27,7 +28,6 @@ XAKE_FLAGS+= CC="${TARGET_CC}" \ INSTALL_STYLE:= auto post-install: - echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_VPNC}/CONTROL/control ${CP} ${WRKINST}/* ${IDIR_VPNC}/ ${CP} files/vpnc-route ${IDIR_VPNC}/etc/vpnc/ ${CP} files/vpnc-script ${IDIR_VPNC}/etc/vpnc/ diff --git a/package/vpnc/ipkg/vpnc.conffiles b/package/vpnc/files/vpnc.conffiles index a25d8a07c..a25d8a07c 100644 --- a/package/vpnc/ipkg/vpnc.conffiles +++ b/package/vpnc/files/vpnc.conffiles diff --git a/package/vpnc/ipkg/vpnc.control b/package/vpnc/ipkg/vpnc.control deleted file mode 100755 index d2db146ac..000000000 --- a/package/vpnc/ipkg/vpnc.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: vpnc -Section: net -Architecture: mipsel -Priority: optional -Description: client for cisco3000 VPN Concentrator. -Depends: libgpg-error, libgcrypt, kmod-tun |