Attachment #20807 for bug #36638

View | Details | Raw Unified | Return to bug 36638
Collapse All | Expand All




PORTNAME=	libslang
PORTVERSION=	${VERSION}.j${JP_VERSION}
CATEGORIES=	japanese devel
MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/
DISTNAME=	slang-${VERSION}

PATCH_SITES=	http://www.asmnet.ne.jp/~matubara/src/
PATCHFILES=	slang-${VERSION}jp${JP_VERSION}.patch.gz
PATCH_DIST_STRIP=	-p1

MAINTAINER=	mega@minz.org

VERSION=	1.4.5
JP_VERSION=	0

USE_BZIP2=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
ALL_TARGET=	all elf

INSTALLS_SHLIB=	yes

post-install:
	${INSTALL_DATA} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang

.include <bsd.port.mk>

Line 1 Link Here

(-)libslang/distinfo (-1 / +2 lines)
1	MD5 (slang-1.4.2jp0.tar.gz) = 9b7ec84155eec235bce4c8d406473eb2	1	MD5 (slang-1.4.5.tar.bz2) = 380f5d0c306b70125a110f54814e26a3
		2	MD5 (slang-1.4.5jp0.patch.gz) = c000d16a895a695663d9f573ea7a383f




--- configure.orig	Sun Feb 10 16:39:19 2002
+++ configure	Mon Feb 25 01:10:52 2002
@@ -2032,6 +2032,26 @@
      ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
      ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
   ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
+
 cat > conftest.$ac_ext <<EOF
 #line 1766 "configure"
 #include "confdefs.h"
@@ -1818,7 +1818,7 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-		DYNAMIC_LINK_LIB="-ldl"
+		DYNAMIC_LINK_LIB=""
 		cat >> confdefs.h <<\EOF
 #define HAVE_DLFCN_H 1
 EOF
@@ -1887,6 +1887,21 @@
        ELF_DEP_LIBS=
      fi
      ;;
+  *freebsd* )
+     if [ "$PORTOBJFORMAT" = elf ]; then
+       DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
+       ELF_CC="\$(CC)"
+       ELF_CFLAGS="\$(CFLAGS) -fPIC"
+       ELF_LINK="\$(CC) -shared -Wl,-soname#"
+       ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
+       ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
+       CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
+     else
+       # aout format is not tested
+       DYNAMIC_LINK_FLAGS=""
+       ELF_CC="\$(CC)"
+       ELF_CFLAGS="\$(CFLAGS) -fpic -DPIC"
+       ELF_LINK="ld -Bshareable -x"
+       ELF_LINK_CMD="\$(ELF_LINK)"
+       ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
+       CC_SHARED="\$(CC) \$(CFLAGS) -fpic -DPIC"
+     fi
+     ;;
   * )
     echo "Note: ELF compiler for host_os=$host_os may be wrong"
     ELF_CC="$CC"
@@ -2432,16 +2452,16 @@
 
 echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
 echo "configure:2435: checking SLANG_VERSION" >&5
-slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
-               awk '{ print $3 }'`
-slang_major_version=`echo $slang_version |
- awk '{ print int($1/10000) }'`
-slang_minor_version=`echo $slang_version $slang_major_version |

- awk '{ print ($1 - $2*10000 - $3*100) }'`
-
-slang_minor_version="$slang_minor_version.$slang_mminor_version"
+#slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
+#               awk '{ print $3 }'`
+#slang_major_version=`echo $slang_version |
+# awk '{ print int($1/10000) }'`
+#slang_minor_version=`echo $slang_version $slang_major_version |
+# awk '{ print int(($1 - $2*10000)/100) }'`
+#slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
+# awk '{ print ($1 - $2*10000 - $3*100) }'`
+slang_major_version=2
+slang_minor_version=5
 slang_version="$slang_major_version.$slang_minor_version"
 echo "$ac_t""$slang_version" 1>&6
 
@@ -2970,21 +2990,3 @@
 
 
 echo ""

-echo " ELF_LINK =" "$ELF_LINK"
-echo "ELF_CFLAGS=" "$ELF_CFLAGS"
-echo ""
-echo "                  prefix:" "$prefix"
-echo "             exec_prefix:" "$exec_prefix"
-echo "    Installation Lib Dir:" "$libdir"
-echo "Installation Include Dir:" "$includedir"
-echo ""
-echo "See also src/sl-feat.h for various features."
-echo "Type 'make' to build normal library."
-echo "On ELF systems, type 'make elf' to create ELF shared library."




--- autoconf/Makefile.in.orig	Sun Feb 24 19:03:54 2002
+++ autoconf/Makefile.in	Sun Feb 24 19:07:01 2002
@@ -10,7 +10,6 @@
 	cd src; $(MAKE) all
 elf:
 	cd src; $(MAKE) elf
-	@echo Use make install-elf to install it.
+
 runtests:
 	cd src; $(MAKE) runtests
 demos:
@@ -23,15 +22,8 @@
 	cd src; $(MAKE) install
 install-elf:
 	cd src; $(MAKE) install-elf




--- src/Makefile.in.orig2	Mon Feb 25 00:59:08 2002
+++ src/Makefile.in	Mon Feb 25 01:06:27 2002
@@ -38,7 +38,7 @@
 exec_prefix = @exec_prefix@
 install_lib_dir = @libdir@
 install_include_dir = @includedir@
-install_doc_dir = $(prefix)/doc/slang
+install_doc_dir = $(prefix)/share/doc/slang
 DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
 MODULE_INSTALL_DIR = @libdir@/slang/modules
 #---------------------------------------------------------------------------
@@ -88,7 +88,11 @@
 # ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)#
 ELFLIB = @ELFLIB@
 ELFLIB_MAJOR = @ELFLIB_MAJOR@
 ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)#
+.if ( ${PORTOBJFORMAT} == "aout" )
 ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR_MINOR@
+.else
+ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR@
+.endif
 
 ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
 
@@ -125,6 +129,7 @@
 $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
 	-$(RM) $(ELFDIR_ELF_LIB)
 	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)

Return to bug 36638

Lines 8-21 Link Here

(-)libslang/Makefile (-4 / +9 lines)
8	PORTNAME= libslang	8	PORTNAME= libslang
9	PORTVERSION= ${VERSION}.j${JP_VERSION}	9	PORTVERSION= ${VERSION}.j${JP_VERSION}
10	CATEGORIES= japanese devel	10	CATEGORIES= japanese devel
11	MASTER_SITES= http://www.actweb.ne.jp/k-yosino/	11	MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/
12	DISTNAME= slang-${VERSION}jp${JP_VERSION}	12	DISTNAME= slang-${VERSION}
		13
		14	PATCH_SITES= http://www.asmnet.ne.jp/~matubara/src/
		15	PATCHFILES= slang-${VERSION}jp${JP_VERSION}.patch.gz
		16	PATCH_DIST_STRIP= -p1
13		17
14	MAINTAINER= mega@minz.org	18	MAINTAINER= mega@minz.org
15		19
16	VERSION= 1.4.2	20	VERSION= 1.4.5
17	JP_VERSION= 0	21	JP_VERSION= 0
18		22
		23	USE_BZIP2= yes
19	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --includedir=${PREFIX}/include/slang	25	CONFIGURE_ARGS= --includedir=${PREFIX}/include/slang
21	ALL_TARGET= all elf	26	ALL_TARGET= all elf
Lines 23-28 Link Here
23	INSTALLS_SHLIB= yes	28	INSTALLS_SHLIB= yes
24		29
25	post-install:	30	post-install:
26	${CP} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang	31	${INSTALL_DATA} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang
27		32
28	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-49 Link Here

(-)libslang/files/patch-aa (-46 / +46 lines)
1	--- configure.orig Wed Aug 30 19:43:10 2000	1	--- configure.orig Sun Feb 10 16:39:19 2002
2	+++ configure Fri Sep 1 05:05:16 2000	2	+++ configure Mon Feb 25 01:10:52 2002
3	@@ -1760,7 +1760,7 @@	3	@@ -2032,6 +2032,26 @@
4	echo $ac_n "(cached) $ac_c" 1>&6	4	ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
5	else	5	ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
6	ac_save_LIBS="$LIBS"
7	-LIBS="-ldl $LIBS"
8	+
9	cat > conftest.$ac_ext <<EOF
10	#line 1766 "configure"
11	#include "confdefs.h"
12	@@ -1818,7 +1818,7 @@
13	if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14	echo "$ac_t""yes" 1>&6
15
16	- DYNAMIC_LINK_LIB="-ldl"
17	+ DYNAMIC_LINK_LIB=""
18	cat >> confdefs.h <<\EOF
19	#define HAVE_DLFCN_H 1
20	EOF
21	@@ -1887,6 +1887,21 @@
22	ELF_DEP_LIBS=
23	fi
24	;;	6	;;
25	+ freebsd )	7	+ freebsd )
26	+ if [ "$PORTOBJFORMAT" = elf ]; then	8	+ if [ "$PORTOBJFORMAT" = elf ]; then
27	+ DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"	9	+ DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
28	+ ELF_CC="\$(CC)"	10	+ ELF_CC="\$(CC)"
29	+ ELF_CFLAGS="\$(CFLAGS) -fPIC"	11	+ ELF_CFLAGS="\$(CFLAGS) -fPIC"
30	+ ELF_LINK="\$(CC) -shared -Wl,-soname#"	12	+ ELF_LINK="\$(CC) -shared -Wl,-soname#"
31	+ ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"	13	+ ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
32	+ else	14	+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
33	+ DYNAMIC_LINK_FLAGS=""	15	+ CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
34	+ ELF_CC="\$(CC)"	16	+ else
35	+ ELF_CFLAGS="\$(CFLAGS) -fPIC"	17	+ # aout format is not tested
36	+ ELF_LINK="ld -Bshareable -x"	18	+ DYNAMIC_LINK_FLAGS=""
37	+ ELF_LINK_CMD="\$(ELF_LINK)"	19	+ ELF_CC="\$(CC)"
38	+ fi	20	+ ELF_CFLAGS="\$(CFLAGS) -fpic -DPIC"
39	+ ;;	21	+ ELF_LINK="ld -Bshareable -x"
		22	+ ELF_LINK_CMD="\$(ELF_LINK)"
		23	+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
		24	+ CC_SHARED="\$(CC) \$(CFLAGS) -fpic -DPIC"
		25	+ fi
		26	+ ;;
40	* )	27	* )
41	echo "Note: ELF compiler for host_os=$host_os may be wrong"	28	echo "Note: ELF compiler for host_os=$host_os may be wrong"
42	ELF_CC="\$(CC)"	29	ELF_CC="$CC"
43	@@ -2233,14 +2248,8 @@	30	@@ -2432,16 +2452,16 @@
44	echo "configure:2234: checking SLANG_VERSION" >&5	31
45	slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h \|	32	echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
46	awk '{ print $3 }'`	33	echo "configure:2435: checking SLANG_VERSION" >&5
		34	-slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h \|
		35	- awk '{ print $3 }'`
47	-slang_major_version=`echo $slang_version \|	36	-slang_major_version=`echo $slang_version \|
48	- awk '{ print int($1/10000) }'`	37	- awk '{ print int($1/10000) }'`
49	-slang_minor_version=`echo $slang_version $slang_major_version \|	38	-slang_minor_version=`echo $slang_version $slang_major_version \|
Lines 52-63 Link Here
52	- awk '{ print ($1 - $210000 - $3100) }'`	41	- awk '{ print ($1 - $210000 - $3100) }'`
53	-	42	-
54	-slang_minor_version="$slang_minor_version.$slang_mminor_version"	43	-slang_minor_version="$slang_minor_version.$slang_mminor_version"
		44	+#slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h \|
		45	+# awk '{ print $3 }'`
		46	+#slang_major_version=`echo $slang_version \|
		47	+# awk '{ print int($1/10000) }'`
		48	+#slang_minor_version=`echo $slang_version $slang_major_version \|
		49	+# awk '{ print int(($1 - $2*10000)/100) }'`
		50	+#slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version \|
		51	+# awk '{ print ($1 - $210000 - $3100) }'`
55	+slang_major_version=2	52	+slang_major_version=2
56	+slang_minor_version=4	53	+slang_minor_version=5
57	slang_version="$slang_major_version.$slang_minor_version"	54	slang_version="$slang_major_version.$slang_minor_version"
58	echo "$ac_t""$slang_version" 1>&6	55	echo "$ac_t""$slang_version" 1>&6
59		56
60	@@ -2765,18 +2774,5 @@	57	@@ -2970,21 +2990,3 @@
61		58
62		59
63	echo ""	60	echo ""
Lines 71-78 Link Here
71	-echo " ELF_LINK =" "$ELF_LINK"	68	-echo " ELF_LINK =" "$ELF_LINK"
72	-echo "ELF_CFLAGS=" "$ELF_CFLAGS"	69	-echo "ELF_CFLAGS=" "$ELF_CFLAGS"
73	-echo ""	70	-echo ""
74	echo "Installation Prefix:" "$prefix"	71	-echo " prefix:" "$prefix"
75	echo ""	72	-echo " exec_prefix:" "$exec_prefix"
		73	-echo " Installation Lib Dir:" "$libdir"
		74	-echo "Installation Include Dir:" "$includedir"
		75	-echo ""
76	-echo "See also src/sl-feat.h for various features."	76	-echo "See also src/sl-feat.h for various features."
77	-echo "Type 'make' to build normal library."	77	-echo "Type 'make' to build normal library."
78	-echo "On ELF systems, type 'make elf' to create ELF shared library."	78	-echo "On ELF systems, type 'make elf' to create ELF shared library."

Lines 1-15 Link Here

(-)libslang/files/patch-ac (-6 / +5 lines)
1	--- autoconf/Makefile.in.orig Wed Aug 30 19:43:10 2000	1	--- autoconf/Makefile.in.orig Sun Feb 24 19:03:54 2002
2	+++ autoconf/Makefile.in Fri Sep 1 04:03:02 2000	2	+++ autoconf/Makefile.in Sun Feb 24 19:07:01 2002
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,6 @@
4	cd src; $(MAKE) all	4	cd src; $(MAKE) all
5	elf:	5	elf:
6	cd src; $(MAKE) elf	6	cd src; $(MAKE) elf
7	- @echo Use make install-elf to install it.	7	- @echo Use make install-elf to install it.
8	+
9	runtests:	8	runtests:
10	cd src/test; $(MAKE)	9	cd src; $(MAKE) runtests
11	demos:	10	demos:
12	@@ -23,15 +23,8 @@	11	@@ -23,15 +22,8 @@
13	cd src; $(MAKE) install	12	cd src; $(MAKE) install
14	install-elf:	13	install-elf:
15	cd src; $(MAKE) install-elf	14	cd src; $(MAKE) install-elf

Lines 1-27 Link Here

(-)libslang/files/patch-ad (-12 / +12 lines)
1	--- src/Makefile.in.orig Wed Aug 30 19:43:11 2000	1	--- src/Makefile.in.orig2 Mon Feb 25 00:59:08 2002
2	+++ src/Makefile.in Fri Sep 1 04:37:36 2000	2	+++ src/Makefile.in Mon Feb 25 01:06:27 2002
3	@@ -36,7 +36,7 @@	3	@@ -38,7 +38,7 @@
4	exec_prefix = @exec_prefix@	4	exec_prefix = @exec_prefix@
5	install_lib_dir = @libdir@	5	install_lib_dir = @libdir@
6	install_include_dir = @includedir@	6	install_include_dir = @includedir@
7	-install_doc_dir = $(prefix)/doc/slang/@slang_version@	7	-install_doc_dir = $(prefix)/doc/slang
8	+install_doc_dir = $(prefix)/share/doc/slang	8	+install_doc_dir = $(prefix)/share/doc/slang
9	DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt	9	DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
		10	MODULE_INSTALL_DIR = @libdir@/slang/modules
10	#---------------------------------------------------------------------------	11	#---------------------------------------------------------------------------
11	# Misc commands (safe to leave these untouched)	12	@@ -88,7 +88,11 @@
12	@@ -74,7 +74,11 @@	13	# ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)#
13		14	ELFLIB = @ELFLIB@
14	ELFLIB = lib$(THIS_LIB).so#	15	ELFLIB_MAJOR = @ELFLIB_MAJOR@
15	ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)#
16	+.if ( ${PORTOBJFORMAT} == "aout" )	16	+.if ( ${PORTOBJFORMAT} == "aout" )
17	ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)#	17	ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR_MINOR@
18	+.else	18	+.else
19	+ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)	19	+ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR@
20	+.endif	20	+.endif
21		21
22	ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#	22	ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
23		23
24	@@ -108,6 +112,7 @@	24	@@ -125,6 +129,7 @@
25	$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)	25	$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
26	-$(RM) $(ELFDIR_ELF_LIB)	26	-$(RM) $(ELFDIR_ELF_LIB)
27	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)	27	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)