diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2004-10-08 03:54:38 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2004-10-08 03:54:38 +0000 |
| commit | 98259803c3695ef599a0222a123106e50b3fffce (patch) | |
| tree | 9c47f1e229f36fa9440993f4151039f54d78ddc1 /net/gatekeeper | |
| parent | Unbreak the build with recent GCC. (diff) | |
Unbreak the build with recent GCC.
Reported by: kris
Approved by: portmgr (krion), fjoe (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=118581
Diffstat (limited to 'net/gatekeeper')
| -rw-r--r-- | net/gatekeeper/Makefile | 8 | ||||
| -rw-r--r-- | net/gatekeeper/files/patch-singleton.h | 15 |
2 files changed, 16 insertions, 7 deletions
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile index ab9d0dcb941a..2a9185ac97a3 100644 --- a/net/gatekeeper/Makefile +++ b/net/gatekeeper/Makefile @@ -31,14 +31,8 @@ MAKE_ENV= PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \ THE_MACHTYPE= ${ARCH:S/i386/x86/} MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} HAS_RADACCT=1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/gnugk ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/addpasswd ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/gatekeeper/files/patch-singleton.h b/net/gatekeeper/files/patch-singleton.h new file mode 100644 index 000000000000..8fad1552cb4b --- /dev/null +++ b/net/gatekeeper/files/patch-singleton.h @@ -0,0 +1,15 @@ +--- singleton.h.orig Thu Oct 7 19:42:31 2004 ++++ singleton.h Thu Oct 7 19:42:49 2004 +@@ -87,12 +87,7 @@ + Singleton(); + ~Singleton(); + +-#ifdef WIN32 + public: +-#else +- private: +- friend T *InstanceOf<T>(); +-#endif + static SingletonBase *m_Instance; + static PMutex m_CreationLock; + }; |