Attachment #21774 for bug #38037

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




PORTNAME=	libslang
PORTVERSION=	${VERSION}.j${JP_VERSION}
CATEGORIES=	japanese devel
MASTER_SITES=	http://www.actweb.ne.jp/k-yosino/
DISTNAME=	slang-${VERSION}jp${JP_VERSION}

MAINTAINER=	shuna@pop16.odn.ne.jp
PATCHFILES=	slang-${VERSION}jp${JP_VERSION}.patch.gz
PATCH_DIST_STRIP=	-p1

MAINTAINER=	mega@minz.org

VERSION=	1.4.5
JP_VERSION=	2

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

Lines 1-2 Link Here

(-)libslang/distinfo (-2 / +1 lines)
1	MD5 (slang-1.4.5.tar.bz2) = 380f5d0c306b70125a110f54814e26a3	1	MD5 (slang-1.4.5jp2.tar.gz) = 17ece81aff09c0c38369c6952d829985
2	MD5 (slang-1.4.5jp0.patch.gz) = c000d16a895a695663d9f573ea7a383f




--- configure.orig	Thu Feb 21 20:10:02 2002
+++ configure	Tue May  7 00:40:04 2002
@@ -1832,8 +1832,8 @@
 #define HAVE_DLFCN_H 1
 EOF
 
-  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1837: checking for dlopen in -ldl" >&5
+  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+echo "configure:1837: checking for dlopen" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1868,7 +1868,7 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-    DYNAMIC_LINK_LIB="-ldl"
+    DYNAMIC_LINK_LIB=""
     cat >> confdefs.h <<\EOF
 #define HAVE_DLOPEN 1
 EOF
@@ -1943,7 +1943,11 @@
 
 ELFLIB="lib\$(THIS_LIB).so"
 ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
+if test $PORTOBJFORMAT = elf; then
+  ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
+else
+  ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
+fi
 
 case "$host_os" in
   *linux* )
@@ -2032,6 +2036,19 @@
      ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
      ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
      ;;
+  *freebsd* )
+     if [ $PORTOBJFORMAT = elf ]; then
+       DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
+       ELF_CC="\$(CC)"
+       ELF_CFLAGS="\$(CFLAGS) -fPIC"
+       ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
+       ELF_LINK_CMD="\$(ELF_LINK)"
+       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"
+       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 +2449,8 @@
 
 echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
 echo "configure:2435: checking SLANG_VERSION" >&5

- 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 "Configuration complete.  You may need to edit src/Makefile."
-echo "You are compiling SLANG with the following compiler configuration:"
-echo "       CC =" "$CC"
-echo "   CFLAGS =" "$CFLAGS"
-echo "  LDFLAGS =" "$LDFLAGS $DYNAMIC_LINK_FLAGS"
-echo ""
-echo "   ELF_CC =" "$ELF_CC"
-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	Thu Feb 21 20:10:02 2002
+++ autoconf/Makefile.in	Tue May  7 00:56:06 2002
@@ -10,7 +10,7 @@
 	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 +23,7 @@
 	cd src; $(MAKE) install
 install-elf:
 	cd src; $(MAKE) install-elf

-	@echo "Although not required, consider doing 'make install-links' to extra links"
-	@echo "On some systems, e.g., linux, you will also have to run ldconfig."
-	@echo ""
-install-links:
-	cd src; $(MAKE) install-links
-	@echo ""
-	@echo "You may also have to run ldconfig to complete the installation."
-	@echo ""
+
 #
 distclean:
 	/bin/rm -f *~ Makefile config.status config.log config.cache files.pck




--- src/Makefile.in.orig	Tue May  7 00:20:07 2002
+++ src/Makefile.in	Tue May  7 00:21:34 2002
@@ -38,7 +38,7 @@
 exec_prefix = @exec_prefix@
 install_lib_dir = @libdir@

 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@
+.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)
+	cd $(ELFDIR); strip $(ELFLIB_MAJOR_MINOR)
 	cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
 	@echo ""
 	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).

Return to bug 38037

Lines 8-26 Link Here

(-)libslang/Makefile (-9 / +4 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= ftp://space.mit.edu/pub/davis/slang/v1.4/	11	MASTER_SITES= http://www.actweb.ne.jp/k-yosino/
12	DISTNAME= slang-${VERSION}	12	DISTNAME= slang-${VERSION}jp${JP_VERSION}
13		13
14	PATCH_SITES= http://www.asmnet.ne.jp/~matubara/src/	14	MAINTAINER= shuna@pop16.odn.ne.jp
15	PATCHFILES= slang-${VERSION}jp${JP_VERSION}.patch.gz
16	PATCH_DIST_STRIP= -p1
17
18	MAINTAINER= mega@minz.org
19		15
20	VERSION= 1.4.5	16	VERSION= 1.4.5
21	JP_VERSION= 0	17	JP_VERSION= 2
22		18
23	USE_BZIP2= yes
24	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --includedir=${PREFIX}/include/slang	20	CONFIGURE_ARGS= --includedir=${PREFIX}/include/slang
26	ALL_TARGET= all elf	21	ALL_TARGET= all elf

Lines 1-33 Link Here

(-)libslang/files/patch-aa (-45 / +41 lines)
1	--- configure.orig Sun Feb 10 16:39:19 2002	1	--- configure.orig Thu Feb 21 20:10:02 2002
2	+++ configure Mon Feb 25 01:10:52 2002	2	+++ configure Tue May 7 00:40:04 2002
3	@@ -2032,6 +2032,26 @@	3	@@ -1832,8 +1832,8 @@
		4	#define HAVE_DLFCN_H 1
		5	EOF
		6
		7	- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
		8	-echo "configure:1837: checking for dlopen in -ldl" >&5
		9	+ echo $ac_n "checking for dlopen""... $ac_c" 1>&6
		10	+echo "configure:1837: checking for dlopen" >&5
		11	ac_lib_var=`echo dl'_'dlopen \| sed 'y%./+-%__p_%'`
		12	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
		13	echo $ac_n "(cached) $ac_c" 1>&6
		14	@@ -1868,7 +1868,7 @@
		15	if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
		16	echo "$ac_t""yes" 1>&6
		17
		18	- DYNAMIC_LINK_LIB="-ldl"
		19	+ DYNAMIC_LINK_LIB=""
		20	cat >> confdefs.h <<\EOF
		21	#define HAVE_DLOPEN 1
		22	EOF
		23	@@ -1943,7 +1943,11 @@
		24
		25	ELFLIB="lib\$(THIS_LIB).so"
		26	ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
		27	-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
		28	+if test $PORTOBJFORMAT = elf; then
		29	+ ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
		30	+else
		31	+ ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
		32	+fi
		33
		34	case "$host_os" in
		35	linux )
		36	@@ -2032,6 +2036,19 @@
4	ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"	37	ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
5	ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"	38	ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
6	;;	39	;;
7	+ freebsd )	40	+ freebsd )
8	+ if [ "$PORTOBJFORMAT" = elf ]; then	41	+ if [ $PORTOBJFORMAT = elf ]; then
9	+ DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
10	+ ELF_CC="\$(CC)"	42	+ ELF_CC="\$(CC)"
11	+ ELF_CFLAGS="\$(CFLAGS) -fPIC"	43	+ ELF_CFLAGS="\$(CFLAGS) -fPIC"
12	+ ELF_LINK="\$(CC) -shared -Wl,-soname#"	44	+ ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
13	+ ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"	45	+ ELF_LINK_CMD="\$(ELF_LINK)"
14	+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
15	+ CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
16	+ else	46	+ else
17	+ # aout format is not tested
18	+ DYNAMIC_LINK_FLAGS=""
19	+ ELF_CC="\$(CC)"	47	+ ELF_CC="\$(CC)"
20	+ ELF_CFLAGS="\$(CFLAGS) -fpic -DPIC"	48	+ ELF_CFLAGS="\$(CFLAGS) -fPIC"
21	+ ELF_LINK="ld -Bshareable -x"	49	+ ELF_LINK="ld -Bshareable -x"
22	+ ELF_LINK_CMD="\$(ELF_LINK)"	50	+ ELF_LINK_CMD="\$(ELF_LINK)"
23	+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
24	+ CC_SHARED="\$(CC) \$(CFLAGS) -fpic -DPIC"
25	+ fi	51	+ fi
26	+ ;;	52	+ ;;
27	* )	53	* )
28	echo "Note: ELF compiler for host_os=$host_os may be wrong"	54	echo "Note: ELF compiler for host_os=$host_os may be wrong"
29	ELF_CC="$CC"	55	ELF_CC="$CC"
30	@@ -2432,16 +2452,16 @@	56	@@ -2432,16 +2449,8 @@
31		57
32	echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6	58	echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
33	echo "configure:2435: checking SLANG_VERSION" >&5	59	echo "configure:2435: checking SLANG_VERSION" >&5
Lines 41-78 Link Here
41	- awk '{ print ($1 - $210000 - $3100) }'`	67	- awk '{ print ($1 - $210000 - $3100) }'`
42	-	68	-
43	-slang_minor_version="$slang_minor_version.$slang_mminor_version"	69	-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) }'`
52	+slang_major_version=2	70	+slang_major_version=2
53	+slang_minor_version=5	71	+slang_minor_version=5
54	slang_version="$slang_major_version.$slang_minor_version"	72	slang_version="$slang_major_version.$slang_minor_version"
55	echo "$ac_t""$slang_version" 1>&6	73	echo "$ac_t""$slang_version" 1>&6
56		74
57	@@ -2970,21 +2990,3 @@
58
59
60	echo ""
61	-echo "Configuration complete. You may need to edit src/Makefile."
62	-echo "You are compiling SLANG with the following compiler configuration:"
63	-echo " CC =" "$CC"
64	-echo " CFLAGS =" "$CFLAGS"
65	-echo " LDFLAGS =" "$LDFLAGS $DYNAMIC_LINK_FLAGS"
66	-echo ""
67	-echo " ELF_CC =" "$ELF_CC"
68	-echo " ELF_LINK =" "$ELF_LINK"
69	-echo "ELF_CFLAGS=" "$ELF_CFLAGS"
70	-echo ""
71	-echo " prefix:" "$prefix"
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."
77	-echo "Type 'make' to build normal library."
78	-echo "On ELF systems, type 'make elf' to create ELF shared library."

Lines 1-14 Link Here

(-)libslang/files/patch-ac (-6 / +8 lines)
1	--- autoconf/Makefile.in.orig Sun Feb 24 19:03:54 2002	1	--- autoconf/Makefile.in.orig Thu Feb 21 20:10:02 2002
2	+++ autoconf/Makefile.in Sun Feb 24 19:07:01 2002	2	+++ autoconf/Makefile.in Tue May 7 00:56:06 2002
3	@@ -10,7 +10,6 @@	3	@@ -10,7 +10,7 @@
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	+
8	runtests:	9	runtests:
9	cd src; $(MAKE) runtests	10	cd src; $(MAKE) runtests
10	demos:	11	demos:
11	@@ -23,15 +22,8 @@	12	@@ -23,15 +23,7 @@
12	cd src; $(MAKE) install	13	cd src; $(MAKE) install
13	install-elf:	14	install-elf:
14	cd src; $(MAKE) install-elf	15	cd src; $(MAKE) install-elf
Lines 16-26 Link Here
16	- @echo "Although not required, consider doing 'make install-links' to extra links"	17	- @echo "Although not required, consider doing 'make install-links' to extra links"
17	- @echo "On some systems, e.g., linux, you will also have to run ldconfig."	18	- @echo "On some systems, e.g., linux, you will also have to run ldconfig."
18	- @echo ""	19	- @echo ""
19	install-links:	20	-install-links:
20	cd src; $(MAKE) install-links	21	- cd src; $(MAKE) install-links
21	- @echo ""	22	- @echo ""
22	- @echo "You may also have to run ldconfig to complete the installation."	23	- @echo "You may also have to run ldconfig to complete the installation."
23	- @echo ""	24	- @echo ""
		25	+
24	#	26	#
25	distclean:	27	distclean:
26	/bin/rm -f *~ Makefile config.status config.log config.cache files.pck	28	/bin/rm -f *~ Makefile config.status config.log config.cache files.pck

Lines 1-5 Link Here

(-)libslang/files/patch-ad (-22 / +2 lines)
1	--- src/Makefile.in.orig2 Mon Feb 25 00:59:08 2002	1	--- src/Makefile.in.orig Tue May 7 00:20:07 2002
2	+++ src/Makefile.in Mon Feb 25 01:06:27 2002	2	+++ src/Makefile.in Tue May 7 00:21:34 2002
3	@@ -38,7 +38,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@
Lines 9-31 Link Here
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	MODULE_INSTALL_DIR = @libdir@/slang/modules
11	#---------------------------------------------------------------------------	11	#---------------------------------------------------------------------------
12	@@ -88,7 +88,11 @@
13	# ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)#
14	ELFLIB = @ELFLIB@
15	ELFLIB_MAJOR = @ELFLIB_MAJOR@
16	+.if ( ${PORTOBJFORMAT} == "aout" )
17	ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR_MINOR@
18	+.else
19	+ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR@
20	+.endif
21
22	ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
23
24	@@ -125,6 +129,7 @@
25	$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
26	-$(RM) $(ELFDIR_ELF_LIB)
27	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)
28	+ cd $(ELFDIR); strip $(ELFLIB_MAJOR_MINOR)
29	cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
30	@echo ""
31	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).