Date: 26 Feb 2000 08:48:14 -0000 From: okazaki@be.to To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17004: Refactoring port: graphics/aalib Message-ID: <20000226084814.6819.qmail@dolphin.be.to>
next in thread | raw e-mail | index | archive | help
>Number: 17004
>Category: ports
>Synopsis: Refactoring port: graphics/aalib
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 26 00:50:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: OKAZAKI Tetsurou
>Release: FreeBSD 3.4-STABLE i386
>Organization:
Unknown
>Environment:
FreeBSD: ports/graphics/aalib/Makefile,v 1.8 1999/08/25 06:13:40
>Description:
I noticed some packaging problems about the current aalib port.
1. The port implicitly depends on Xlib if XFree86 is
installed at build time.
2. Since original configure.in is broken yet about
the use of two macros AC_SLANG and AC_NCURSES,
aalib binaries are accidentally linked *not* with
built-in ncurses but under `/usr/local/lib' when
devel/ncurses is installed.
As a result, these two dependencies are not recorded in
the package database in the above situation.
>How-To-Repeat:
% cd /usr/ports/x11/XFree86
% make install
% cd /usr/ports/devel/ncurses
% make install
% cd /usr/ports/graphics/aalib
% make install
% ldd `which aafire`
>Fix:
Please apply the following patch, thanks.
Change Log:
* do not configure X11 driver when NO_X11 is defined.
* declare USE_XLIB when XFree86 is installed
and NO_X11 is not defined.
* fix configure.in more to use built-in ncurses if exist,
and turn on USE_AUTOCONF.
* remove patches already obsoleted by USE_LIBTOOL.
Modified: Makefile patches/patch-ac
New file: patches/patch-ae
Removed: patches/patch-ab patch-ad
diff -urN /usr/ports/graphics/aalib/Makefile aalib/Makefile
--- /usr/ports/graphics/aalib/Makefile Sat Aug 28 00:45:18 1999
+++ aalib/Makefile Sat Feb 26 15:56:33 2000
@@ -12,7 +12,25 @@
MAINTAINER= andy@icc.surw.chel.su
+USE_AUTOCONF= yes
USE_LIBTOOL= yes
+
+#
+# Support for X11 is compiled in by default only if X11 is installed.
+#
+.if !exists(${X11BASE})
+NO_X11?= yes
+.endif
+.if !defined(NO_X11)
+USE_XLIB=YES
+CONFIGURE_ARGS= --with-x --x-includes="${X11BASE}/include" \
+ --x-libraries="${X11BASE}/lib"
+.else
+CONFIGURE_ARGS= --with-x11-driver=no
+.endif
+
+post-patch:
+ @${PERL} -pi -e "s:/usr/local:${LOCALBASE}:g;" ${WRKSRC}/configure.in
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff -urN /usr/ports/graphics/aalib/patches/patch-ab aalib/patches/patch-ab
--- /usr/ports/graphics/aalib/patches/patch-ab Mon Apr 20 07:29:31 1998
+++ aalib/patches/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,60 +0,0 @@
---- configure.orig Sun Apr 19 12:18:10 1998
-+++ configure Sun Apr 19 12:18:11 1998
-@@ -687,57 +687,10 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:692: checking for working aclocal" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf. Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-- ACLOCAL=aclocal
-- echo "$ac_t""found" 1>&6
--else
- ACLOCAL="$missing_dir/missing aclocal"
-- echo "$ac_t""missing" 1>&6
--fi
--
--echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:705: checking for working autoconf" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf. Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-- AUTOCONF=autoconf
-- echo "$ac_t""found" 1>&6
--else
- AUTOCONF="$missing_dir/missing autoconf"
-- echo "$ac_t""missing" 1>&6
--fi
--
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:718: checking for working automake" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf. Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
-- AUTOMAKE=automake
-- echo "$ac_t""found" 1>&6
--else
- AUTOMAKE="$missing_dir/missing automake"
-- echo "$ac_t""missing" 1>&6
--fi
--
--echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:731: checking for working autoheader" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf. Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-- AUTOHEADER=autoheader
-- echo "$ac_t""found" 1>&6
--else
- AUTOHEADER="$missing_dir/missing autoheader"
-- echo "$ac_t""missing" 1>&6
--fi
-
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
- echo "configure:744: checking for working makeinfo" >&5
diff -urN /usr/ports/graphics/aalib/patches/patch-ac aalib/patches/patch-ac
--- /usr/ports/graphics/aalib/patches/patch-ac Mon Apr 20 07:29:31 1998
+++ aalib/patches/patch-ac Tue Dec 7 02:23:03 1999
@@ -1,11 +1,34 @@
---- configure.in.orig Tue Oct 28 22:48:40 1997
-+++ configure.in Sun Apr 19 12:18:10 1998
-@@ -245,7 +245,7 @@
+--- configure.in.orig Wed Oct 29 06:48:40 1997
++++ configure.in Tue Dec 7 02:22:17 1999
+@@ -243,9 +243,9 @@
+ fi
+ fi
])
- AC_SLANG(/usr/include, slang.h, , -I/usr/include/slang , "slang on /usr/include")
+- AC_SLANG(/usr/include, slang.h, , -I/usr/include/slang , "slang on /usr/include")
++ AC_SLANG(/usr/include, slang.h, , -I/usr/include , "slang on /usr/include")
AC_SLANG(/usr/include/slang, slang.h, , -I/usr/include/slang , "slang on /usr/include/slang")
- AC_SLANG(/usr/local/include, slang.h, , -I/usr/local/include/slang , "slang on /usr/local/include")
+ AC_SLANG(/usr/local/include, slang.h, , -I/usr/local/include , "slang on /usr/local/include")
AC_SLANG(/usr/local/include/slang, slang.h, , -I/usr/local/include/slang , "slang on /usr/local/include/slang")
if test "$slang_driver" = true; then
if test "$force_curses_driver" = false; then
+@@ -314,14 +314,14 @@
+ then
+ AC_CHECKING("location of curses")
+
+- AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include")
+- AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
+- AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local")
++ AC_NCURSES(/usr/include, ncurses.h, -L/usr/lib, -I/usr/include , "ncurses on /usr/include")
++ AC_NCURSES(/usr/include/ncurses, ncurses.h, -L/usr/lib, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
++ AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local")
+ AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
+
+- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
++ AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/include/ncurses")
+
+- AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
++ AC_NCURSES(/usr/include/ncurses, curses.h, -L/usr/lib, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+ AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include")
+
+ dnl
diff -urN /usr/ports/graphics/aalib/patches/patch-ad aalib/patches/patch-ad
--- /usr/ports/graphics/aalib/patches/patch-ad Thu Feb 4 18:42:48 1999
+++ aalib/patches/patch-ad Thu Jan 1 09:00:00 1970
@@ -1,53 +0,0 @@
---- ltmain.sh.orig Thu Sep 25 20:22:11 1997
-+++ ltmain.sh Tue Feb 2 05:43:17 1999
-@@ -710,6 +710,16 @@
- versuffix="$current.$revision"
- ;;
-
-+ freebsd)
-+ version_vars="$version_vars major versuffix"
-+ major="$current"
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ versuffix="$current";
-+ else
-+ versuffix="$current.$revision";
-+ fi
-+ ;;
-+
- *)
- echo "$progname: unknown library version type \`$version_type'" 1>&2
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig Thu Sep 25 20:22:04 1997
-+++ ltconfig Tue Feb 2 05:45:00 1999
-@@ -640,7 +640,7 @@
- ;;
-
- # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-- freebsd3*)
-+ freebsd*)
- archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
- hardcode_direct=yes
- hardcode_minusL=yes
-@@ -766,10 +766,21 @@
- soname_spec='$libname.so.$major'
- ;;
-
--freebsd2* | freebsd3*)
-+freebsd2*)
- version_type=sunos
- library_names_spec='$libname.so.$versuffix $libname.so'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd*)
-+ version_type=freebsd
-+ library_names_spec='$libname.so.$versuffix $libname.so'
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+ else
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ fi
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
diff -urN /usr/ports/graphics/aalib/patches/patch-ae aalib/patches/patch-ae
--- /usr/ports/graphics/aalib/patches/patch-ae Thu Jan 1 09:00:00 1970
+++ aalib/patches/patch-ae Tue Dec 7 03:28:02 1999
@@ -0,0 +1,11 @@
+--- aclocal.m4.orig Wed Nov 12 05:17:00 1997
++++ aclocal.m4 Tue Dec 7 03:26:34 1999
+@@ -10,7 +10,7 @@
+ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+ AC_DEFUN(AM_INIT_AUTOMAKE,
+-[AC_REQUIRE([AM_PROG_INSTALL])
++[AC_REQUIRE([AC_PROG_INSTALL])
+ PACKAGE=[$1]
+ AC_SUBST(PACKAGE)
+ VERSION=[$2]
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000226084814.6819.qmail>