- Unbreak on amd64 and ia64

PR:		ports/77278
Submitted by:	Johan van Selst <johans@stack.nl>

8 files changed, 118 insertions, 14 deletions

diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile
index d80ab3718667..9b3bab06ad12 100644
--- a/lang/afnix/Makefile
+++ b/lang/afnix/Makefile
@@ -27,16 +27,10 @@ PLIST_SUB=	PORTVER=${PORTVERSION:R}
 
 MAN1=	aleph.1 axc.1 axl.1
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
-.endif
-
 do-configure:
 	@(cd ${WRKSRC}; ./cnf/bin/aleph-setup -o)
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/aleph
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/afnix/files/patch-cnf_bin_aleph-guess b/lang/afnix/files/patch-cnf_bin_aleph-guess
new file mode 100644
index 000000000000..b2336fe2517f
--- /dev/null
+++ b/lang/afnix/files/patch-cnf_bin_aleph-guess
@@ -0,0 +1,10 @@
+--- cnf/bin/aleph-guess.orig	Tue Feb  8 21:33:40 2005
++++ cnf/bin/aleph-guess	Tue Feb  8 21:33:37 2005
+@@ -113,6 +113,7 @@
+     mips)     proc_name=mips;;
+     mipsel)   proc_name=mipsel;;    
+     parisc64) proc_name=pa64;;
++    amd64)    proc_name=amd64;;
+     ia64)     proc_name=ia64;;
+     s390)     proc_name=s390;;
+     esac
diff --git a/lang/afnix/files/patch-cnf_mak_aleph-gcc-3.mak b/lang/afnix/files/patch-cnf_mak_aleph-gcc-3.mak
new file mode 100644
index 000000000000..5f907e0011d1
--- /dev/null
+++ b/lang/afnix/files/patch-cnf_mak_aleph-gcc-3.mak
@@ -0,0 +1,11 @@
+--- cnf/mak/aleph-gcc-3.mak.orig	Tue Feb  8 21:55:12 2005
++++ cnf/mak/aleph-gcc-3.mak	Tue Feb  8 21:43:13 2005
+@@ -43,7 +43,7 @@ ALPCPPVERS	= 3
+ # - compiler dependant libraries                                             -
+ # ----------------------------------------------------------------------------
+ 
+-ALPCPPLIBS	= -lsupc++
++ALPCPPLIBS	=
+ 
+ # ----------------------------------------------------------------------------
+ # - platform dependant linking flags                                         -
diff --git a/lang/afnix/files/patch-src_plt_acf_ccnf.cpp b/lang/afnix/files/patch-src_plt_acf_ccnf.cpp
new file mode 100644
index 000000000000..2f35454f60c2
--- /dev/null
+++ b/lang/afnix/files/patch-src_plt_acf_ccnf.cpp
@@ -0,0 +1,37 @@
+--- src/plt/acf/ccnf.cpp.orig	Tue Feb  8 21:37:05 2005
++++ src/plt/acf/ccnf.cpp	Tue Feb  8 21:38:33 2005
+@@ -41,6 +41,7 @@
+ #define ALEPH_PROCTYPE_PA64      9
+ #define ALEPH_PROCTYPE_IA64     10
+ #define ALEPH_PROCTYPE_S390     11
++#define ALEPH_PROCTYPE_AMD64    12
+ 
+ // recognized processor name
+ #define ALEPH_PROCNAME_IA        "ia"
+@@ -54,6 +55,7 @@
+ #define ALEPH_PROCNAME_PA64      "pa64"
+ #define ALEPH_PROCNAME_IA64      "ia64"
+ #define ALEPH_PROCNAME_S390      "s390"
++#define ALEPH_PROCNAME_AMD64     "amd64"
+ 
+ // force size type with S390
+ #if defined(__s390__)
+@@ -114,6 +116,9 @@
+   // s390
+   if (strcmp (proc, ALEPH_PROCNAME_S390) == 0)
+     return ALEPH_PROCTYPE_S390;
++  // amd64
++  if (strcmp (proc, ALEPH_PROCNAME_AMD64) == 0)
++    return ALEPH_PROCTYPE_AMD64;
+   // unknown
+   return ALEPH_PROCTYPE_UNKNOWN;
+ }
+@@ -228,6 +233,8 @@
+ 	   ALEPH_PROCTYPE_IA64);
+   fprintf (stdout, "#define  ALEPH_PROCTYPE_S390      %d\n",
+ 	   ALEPH_PROCTYPE_S390);
++  fprintf (stdout, "#define  ALEPH_PROCTYPE_AMD64     %d\n",
++	   ALEPH_PROCTYPE_AMD64);
+   fprintf (stdout, "\n");
+ 
+   // install the config names
diff --git a/lang/aleph/Makefile b/lang/aleph/Makefile
index d80ab3718667..9b3bab06ad12 100644
--- a/lang/aleph/Makefile
+++ b/lang/aleph/Makefile
@@ -27,16 +27,10 @@ PLIST_SUB=	PORTVER=${PORTVERSION:R}
 
 MAN1=	aleph.1 axc.1 axl.1
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
-.endif
-
 do-configure:
 	@(cd ${WRKSRC}; ./cnf/bin/aleph-setup -o)
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/aleph
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/aleph/files/patch-cnf_bin_aleph-guess b/lang/aleph/files/patch-cnf_bin_aleph-guess
new file mode 100644
index 000000000000..b2336fe2517f
--- /dev/null
+++ b/lang/aleph/files/patch-cnf_bin_aleph-guess
@@ -0,0 +1,10 @@
+--- cnf/bin/aleph-guess.orig	Tue Feb  8 21:33:40 2005
++++ cnf/bin/aleph-guess	Tue Feb  8 21:33:37 2005
+@@ -113,6 +113,7 @@
+     mips)     proc_name=mips;;
+     mipsel)   proc_name=mipsel;;    
+     parisc64) proc_name=pa64;;
++    amd64)    proc_name=amd64;;
+     ia64)     proc_name=ia64;;
+     s390)     proc_name=s390;;
+     esac
diff --git a/lang/aleph/files/patch-cnf_mak_aleph-gcc-3.mak b/lang/aleph/files/patch-cnf_mak_aleph-gcc-3.mak
new file mode 100644
index 000000000000..5f907e0011d1
--- /dev/null
+++ b/lang/aleph/files/patch-cnf_mak_aleph-gcc-3.mak
@@ -0,0 +1,11 @@
+--- cnf/mak/aleph-gcc-3.mak.orig	Tue Feb  8 21:55:12 2005
++++ cnf/mak/aleph-gcc-3.mak	Tue Feb  8 21:43:13 2005
+@@ -43,7 +43,7 @@ ALPCPPVERS	= 3
+ # - compiler dependant libraries                                             -
+ # ----------------------------------------------------------------------------
+ 
+-ALPCPPLIBS	= -lsupc++
++ALPCPPLIBS	=
+ 
+ # ----------------------------------------------------------------------------
+ # - platform dependant linking flags                                         -
diff --git a/lang/aleph/files/patch-src_plt_acf_ccnf.cpp b/lang/aleph/files/patch-src_plt_acf_ccnf.cpp
new file mode 100644
index 000000000000..2f35454f60c2
--- /dev/null
+++ b/lang/aleph/files/patch-src_plt_acf_ccnf.cpp
@@ -0,0 +1,37 @@
+--- src/plt/acf/ccnf.cpp.orig	Tue Feb  8 21:37:05 2005
++++ src/plt/acf/ccnf.cpp	Tue Feb  8 21:38:33 2005
+@@ -41,6 +41,7 @@
+ #define ALEPH_PROCTYPE_PA64      9
+ #define ALEPH_PROCTYPE_IA64     10
+ #define ALEPH_PROCTYPE_S390     11
++#define ALEPH_PROCTYPE_AMD64    12
+ 
+ // recognized processor name
+ #define ALEPH_PROCNAME_IA        "ia"
+@@ -54,6 +55,7 @@
+ #define ALEPH_PROCNAME_PA64      "pa64"
+ #define ALEPH_PROCNAME_IA64      "ia64"
+ #define ALEPH_PROCNAME_S390      "s390"
++#define ALEPH_PROCNAME_AMD64     "amd64"
+ 
+ // force size type with S390
+ #if defined(__s390__)
+@@ -114,6 +116,9 @@
+   // s390
+   if (strcmp (proc, ALEPH_PROCNAME_S390) == 0)
+     return ALEPH_PROCTYPE_S390;
++  // amd64
++  if (strcmp (proc, ALEPH_PROCNAME_AMD64) == 0)
++    return ALEPH_PROCTYPE_AMD64;
+   // unknown
+   return ALEPH_PROCTYPE_UNKNOWN;
+ }
+@@ -228,6 +233,8 @@
+ 	   ALEPH_PROCTYPE_IA64);
+   fprintf (stdout, "#define  ALEPH_PROCTYPE_S390      %d\n",
+ 	   ALEPH_PROCTYPE_S390);
++  fprintf (stdout, "#define  ALEPH_PROCTYPE_AMD64     %d\n",
++	   ALEPH_PROCTYPE_AMD64);
+   fprintf (stdout, "\n");
+ 
+   // install the config names