- Support CXX/CXXFLAGS/PTHREAD_CFLAGS/PTHREAD_LIBS properly

- Fix pkg-plist
- Strip binaries

PR:		26554
Submitted by:	tkato@prontomail.ne.jp

6 files changed, 78 insertions, 20 deletions

diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile
index f3aef2a785d5..c6336035e2f6 100644
--- a/lang/afnix/Makefile
+++ b/lang/afnix/Makefile
@@ -15,16 +15,21 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION:S,.,-,g}
 
 MAINTAINER=	ijliao@FreeBSD.org
 
-USE_GMAKE=	yes
 USE_NEWGCC=	yes
-
+USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CXX}" LD="${CXX}" LK="${CXX}" OPTCCFLAGS="${CXXFLAGS}" \
+		DYNCCFLAGS="-fPIC -DPIC" DEBUGFLAGS="" DBGDEFINES="" \
+		STDDEFINES="${PTHREAD_CFLAGS}" EXELDFLAGS="${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
-PLIST_SUB=	PORTVER=${PORTVERSION}
+PLIST_SUB=	PORTVER=${PORTVERSION:R}
 
 MAN1=	aleph.1
 
 do-configure:
 	@(cd ${WRKSRC}; ./cnf/bin/aleph-setup -o)
 
+post-install:
+	@strip ${PREFIX}/bin/aleph
+
 .include <bsd.port.mk>
diff --git a/lang/afnix/files/patch-cnf::mak::aleph-rule.mak b/lang/afnix/files/patch-cnf::mak::aleph-rule.mak
new file mode 100644
index 000000000000..ad62af26242a
--- /dev/null
+++ b/lang/afnix/files/patch-cnf::mak::aleph-rule.mak
@@ -0,0 +1,31 @@
+--- cnf/mak/aleph-rule.mak.orig	Thu Mar  8 14:59:08 2001
++++ cnf/mak/aleph-rule.mak	Sat Apr 14 05:43:10 2001
+@@ -62,8 +62,8 @@
+ endif
+ 
+ ifeq ($(LKMODE),soname)
+-SONAME		= $(SOLIB).$(MAJOR).$(MINOR)
+-SOVERS		= $(SOLIB).$(MAJOR).$(MINOR).$(PATCH)
++SONAME		= $(SOLIB).$(MAJOR)
++SOVERS		= $(SOLIB).$(MAJOR)
+ endif
+ 
+ # ----------------------------------------------------------------------------
+@@ -124,17 +124,13 @@
+ $(SOLIB) : $(SOVERS)
+ 	@$(MKDIR)        $(BLDLIB)
+ 	@$(CP) $(SOVERS) $(BLDLIB)
+-	@$(RM) $(BLDLIB)/$(SOLIB)
+ 	@$(RM) $(BLDLIB)/$(SONAME)
+-	@$(LN) $(SOVERS) $(BLDLIB)/$(SONAME)
+ 	@$(LN) $(SONAME) $(BLDLIB)/$(SOLIB)
+ 
+ install-solib : $(SOVERS)
+ 	@$(MKDIR)        $(LIBDIR)
+ 	@$(CP) $(SOVERS) $(LIBDIR)
+-	@$(RM) $(LIBDIR)/$(SONAME)
+ 	@$(RM) $(LIBDIR)/$(SOLIB)
+-	@$(LN) $(SOVERS) $(LIBDIR)/$(SONAME)
+ 	@$(LN) $(SONAME) $(LIBDIR)/$(SOLIB)
+ .PHONY: install-solib
+ endif
diff --git a/lang/afnix/pkg-plist b/lang/afnix/pkg-plist
index 111c846e8c66..f1739d916c26 100644
--- a/lang/afnix/pkg-plist
+++ b/lang/afnix/pkg-plist
@@ -123,29 +123,22 @@ include/aleph/www/Url.hpp
 @dirrm include/aleph
 lib/libaleph-eng.a
 lib/libaleph-eng.so
-lib/libaleph-eng.so.0.7
 lib/libaleph-eng.so.%%PORTVER%%
 lib/libaleph-net.a
 lib/libaleph-net.so
-lib/libaleph-net.so.0.7
 lib/libaleph-net.so.%%PORTVER%%
 lib/libaleph-plt.a
 lib/libaleph-plt.so
-lib/libaleph-plt.so.0.7
 lib/libaleph-plt.so.%%PORTVER%%
 lib/libaleph-sio.a
 lib/libaleph-sio.so
-lib/libaleph-sio.so.0.7
 lib/libaleph-sio.so.%%PORTVER%%
 lib/libaleph-std.a
 lib/libaleph-std.so
-lib/libaleph-std.so.0.7
 lib/libaleph-std.so.%%PORTVER%%
 lib/libaleph-sys.a
 lib/libaleph-sys.so
-lib/libaleph-sys.so.0.7
 lib/libaleph-sys.so.%%PORTVER%%
 lib/libaleph-www.a
 lib/libaleph-www.so
-lib/libaleph-www.so.0.7
 lib/libaleph-www.so.%%PORTVER%%
diff --git a/lang/aleph/Makefile b/lang/aleph/Makefile
index f3aef2a785d5..c6336035e2f6 100644
--- a/lang/aleph/Makefile
+++ b/lang/aleph/Makefile
@@ -15,16 +15,21 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION:S,.,-,g}
 
 MAINTAINER=	ijliao@FreeBSD.org
 
-USE_GMAKE=	yes
 USE_NEWGCC=	yes
-
+USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CXX}" LD="${CXX}" LK="${CXX}" OPTCCFLAGS="${CXXFLAGS}" \
+		DYNCCFLAGS="-fPIC -DPIC" DEBUGFLAGS="" DBGDEFINES="" \
+		STDDEFINES="${PTHREAD_CFLAGS}" EXELDFLAGS="${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
-PLIST_SUB=	PORTVER=${PORTVERSION}
+PLIST_SUB=	PORTVER=${PORTVERSION:R}
 
 MAN1=	aleph.1
 
 do-configure:
 	@(cd ${WRKSRC}; ./cnf/bin/aleph-setup -o)
 
+post-install:
+	@strip ${PREFIX}/bin/aleph
+
 .include <bsd.port.mk>
diff --git a/lang/aleph/files/patch-cnf::mak::aleph-rule.mak b/lang/aleph/files/patch-cnf::mak::aleph-rule.mak
new file mode 100644
index 000000000000..ad62af26242a
--- /dev/null
+++ b/lang/aleph/files/patch-cnf::mak::aleph-rule.mak
@@ -0,0 +1,31 @@
+--- cnf/mak/aleph-rule.mak.orig	Thu Mar  8 14:59:08 2001
++++ cnf/mak/aleph-rule.mak	Sat Apr 14 05:43:10 2001
+@@ -62,8 +62,8 @@
+ endif
+ 
+ ifeq ($(LKMODE),soname)
+-SONAME		= $(SOLIB).$(MAJOR).$(MINOR)
+-SOVERS		= $(SOLIB).$(MAJOR).$(MINOR).$(PATCH)
++SONAME		= $(SOLIB).$(MAJOR)
++SOVERS		= $(SOLIB).$(MAJOR)
+ endif
+ 
+ # ----------------------------------------------------------------------------
+@@ -124,17 +124,13 @@
+ $(SOLIB) : $(SOVERS)
+ 	@$(MKDIR)        $(BLDLIB)
+ 	@$(CP) $(SOVERS) $(BLDLIB)
+-	@$(RM) $(BLDLIB)/$(SOLIB)
+ 	@$(RM) $(BLDLIB)/$(SONAME)
+-	@$(LN) $(SOVERS) $(BLDLIB)/$(SONAME)
+ 	@$(LN) $(SONAME) $(BLDLIB)/$(SOLIB)
+ 
+ install-solib : $(SOVERS)
+ 	@$(MKDIR)        $(LIBDIR)
+ 	@$(CP) $(SOVERS) $(LIBDIR)
+-	@$(RM) $(LIBDIR)/$(SONAME)
+ 	@$(RM) $(LIBDIR)/$(SOLIB)
+-	@$(LN) $(SOVERS) $(LIBDIR)/$(SONAME)
+ 	@$(LN) $(SONAME) $(LIBDIR)/$(SOLIB)
+ .PHONY: install-solib
+ endif
diff --git a/lang/aleph/pkg-plist b/lang/aleph/pkg-plist
index 111c846e8c66..f1739d916c26 100644
--- a/lang/aleph/pkg-plist
+++ b/lang/aleph/pkg-plist
@@ -123,29 +123,22 @@ include/aleph/www/Url.hpp
 @dirrm include/aleph
 lib/libaleph-eng.a
 lib/libaleph-eng.so
-lib/libaleph-eng.so.0.7
 lib/libaleph-eng.so.%%PORTVER%%
 lib/libaleph-net.a
 lib/libaleph-net.so
-lib/libaleph-net.so.0.7
 lib/libaleph-net.so.%%PORTVER%%
 lib/libaleph-plt.a
 lib/libaleph-plt.so
-lib/libaleph-plt.so.0.7
 lib/libaleph-plt.so.%%PORTVER%%
 lib/libaleph-sio.a
 lib/libaleph-sio.so
-lib/libaleph-sio.so.0.7
 lib/libaleph-sio.so.%%PORTVER%%
 lib/libaleph-std.a
 lib/libaleph-std.so
-lib/libaleph-std.so.0.7
 lib/libaleph-std.so.%%PORTVER%%
 lib/libaleph-sys.a
 lib/libaleph-sys.so
-lib/libaleph-sys.so.0.7
 lib/libaleph-sys.so.%%PORTVER%%
 lib/libaleph-www.a
 lib/libaleph-www.so
-lib/libaleph-www.so.0.7
 lib/libaleph-www.so.%%PORTVER%%