cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix automake issue, pointed out by naddy@

Browse Source
This commit is contained in:
kevlo 2001-10-08 02:12:58 +00:00
parent ef1756671b
commit 834139b6e6
6 changed files with 53 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
astro/kstars/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2001/09/28 06:02:13 pvalchev Exp $ # $OpenBSD: Makefile,v 1.3 2001/10/08 02:12:58 kevlo Exp $
COMMENT= "desktop planetarium" COMMENT= "desktop planetarium"
DISTNAME= kstars-0.6 DISTNAME= kstars-0.6
CATEGORIES= astro CATEGORIES= astro
NEED_VERSION= 1.454 NEED_VERSION= 1.474
HOMEPAGE= http://kstars.sourceforge.net/ HOMEPAGE= http://kstars.sourceforge.net/
@ -16,9 +16,11 @@ PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= kstars MASTER_SITE_SUBDIR= kstars
BUILD_DEPENDS= automake::devel/automake \
uic::x11/qt2-designer
BUILD_DEPENDS= uic::x11/qt2-designer
LIB_DEPENDS= kdecore.3.::x11/kde/libs2 LIB_DEPENDS= kdecore.3.::x11/kde/libs2
MODULES= qt2 MODULES= qt2
@ -28,8 +30,7 @@ MAKE_ENV= ${CONFIGURE_ENV}
MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
USE_X11= Yes USE_X11= Yes
USE_GMAKE= Yes CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include

58
astro/kstars/patches/patch-aclocal_m4
View File

@ -1,47 +1,19 @@
--- aclocal.m4.orig Wed Sep 12 16:37:44 2001 --- aclocal.m4.orig Sat Oct 6 09:51:32 2001
+++ aclocal.m4 Wed Sep 12 16:39:44 2001 +++ aclocal.m4 Sat Oct 6 09:53:09 2001
@@ -1,6 +1,6 @@ @@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4 -dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +dnl aclocal.m4 generated automatically by aclocal 1.4-p4
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, @@ -4510,6 +4510,10 @@
dnl with or without modifications, as long as this notice is preserved. lt_cv_file_magic_cmd='/usr/bin/file -L'
@@ -4752,7 +4752,7 @@ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
dnl Usage: fi
dnl AM_INIT_AUTOMAKE(package,version, [no-define]) + ;;
+
+openbsd* )
+ lt_cv_deplibs_check_method=pass_all
;;
-AC_DEFUN(AM_INIT_AUTOMAKE, osf3* | osf4* | osf5*)
+AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
@@ -4780,7 +4780,7 @@
# Check to make sure that the build environment is sane.
#
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
@@ -4821,7 +4821,7 @@
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
[AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
@@ -4837,7 +4837,7 @@
# Like AC_CONFIG_HEADER, but automatically create stamp file.
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
[AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file.

4
astro/kstars/patches/patch-admin_ltcf-c_sh
View File

@ -1,5 +1,5 @@
--- admin/ltcf-c.sh.orig Wed Sep 12 16:40:10 2001 --- admin/ltcf-c.sh.orig Sat Oct 6 11:01:07 2001
+++ admin/ltcf-c.sh Wed Sep 12 16:42:17 2001 +++ admin/ltcf-c.sh Sat Oct 6 11:03:19 2001
@@ -398,10 +398,14 @@ @@ -398,10 +398,14 @@
;; ;;

6
astro/kstars/patches/patch-admin_ltcf-cxx_sh
View File

@ -1,12 +1,12 @@
--- admin/ltcf-cxx.sh.orig Wed Sep 12 16:40:15 2001 --- admin/ltcf-cxx.sh.orig Sat Oct 6 11:03:50 2001
+++ admin/ltcf-cxx.sh Wed Sep 12 16:45:24 2001 +++ admin/ltcf-cxx.sh Sat Oct 6 11:06:11 2001
@@ -339,6 +339,19 @@ @@ -339,6 +339,19 @@
ld_shlibs=no ld_shlibs=no
fi fi
;; ;;
+ openbsd*) + openbsd*)
+ if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then + if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
+ # MM: OpenBSD 2.7 uses G++, but not GNU ld + # MM: OpenBSD 2.7 uses G++, but not GNU ld
+ archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib' + old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'

26
astro/kstars/patches/patch-kstars_data_Makefile_am Normal file
View File

@ -0,0 +1,26 @@
--- kstars/data/Makefile.am.orig Sat Oct 6 12:32:08 2001
+++ kstars/data/Makefile.am Sat Oct 6 12:35:06 2001
@@ -17,17 +17,17 @@
$(mkinstalldirs) $(kde_datadir)/kstars/
$(INSTALL_DATA) $(srcdir)/sao.dat $(kde_datadir)/kstars/sao.dat
$(mkinstalldirs) $(kde_icondir)/hicolor/16x16/apps/
- $(INSTALL_DATA) $(srcdir)/hi16-app-kstars.png $(kde_icondir)/hicolor/16x16/apps/kstars.png
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kstars.png
$(mkinstalldirs) $(kde_icondir)/hicolor/32x32/apps/
- $(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(kde_icondir)/hicolor/32x32/apps/kstars.png
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kstars.png
$(mkinstalldirs) $(kde_icondir)/hicolor/48x48/apps/
- $(INSTALL_DATA) $(srcdir)/hi48-app-kstars.png $(kde_icondir)/hicolor/48x48/apps/kstars.png
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kstars.png
$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
- $(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(kde_icondir)/locolor/16x16/apps/kstars.png
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kstars.png
$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
- $(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(kde_icondir)/locolor/32x32/apps/kstars.png
+ $(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kstars.png
$(mkinstalldirs) $(kde_icondir)/locolor/48x48/apps/
- $(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(kde_icondir)/locolor/48x48/apps/kstars.png
+ $(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/48x48/apps/kstars.png
$(mkinstalldirs) $(kde_datadir)/kstars/
$(INSTALL_DATA) $(srcdir)/geomap.png $(kde_datadir)/kstars/geomap.png
$(mkinstalldirs) $(kde_datadir)/kstars/

34
astro/kstars/patches/patch-kstars_data_Makefile_in
View File

@ -1,34 +0,0 @@
--- kstars/data/Makefile.in.orig Wed Sep 12 16:28:39 2001
+++ kstars/data/Makefile.in Wed Sep 12 16:30:49 2001
@@ -367,7 +367,7 @@
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/
#>- $(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(kde_icondir)/hicolor/32x32/apps/kstars.png
#>+ 1
- $(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(kde_icondir)/hicolor/32x32/apps/kstars.png $(DESTDIR)
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kstars.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kstars.png
#>- $(mkinstalldirs) $(kde_icondir)/hicolor/48x48/apps/
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/
@@ -379,19 +379,19 @@
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/
#>- $(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(kde_icondir)/locolor/16x16/apps/kstars.png
#>+ 1
- $(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(kde_icondir)/locolor/16x16/apps/kstars.png $(DESTDIR)
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kstars.png
#>- $(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/
#>- $(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(kde_icondir)/locolor/32x32/apps/kstars.png
#>+ 1
- $(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(kde_icondir)/locolor/32x32/apps/kstars.png $(DESTDIR)
+ $(INSTALL_DATA) $(srcdir)/lo32-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kstars.png
#>- $(mkinstalldirs) $(kde_icondir)/locolor/48x48/apps/
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/48x48/apps/
#>- $(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(kde_icondir)/locolor/48x48/apps/kstars.png
#>+ 1
- $(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(kde_icondir)/locolor/48x48/apps/kstars.png $(DESTDIR)
+ $(INSTALL_DATA) $(srcdir)/lo48-app-kstars.png $(DESTDIR)$(kde_icondir)/locolor/48x48/apps/kstars.png
#>- $(mkinstalldirs) $(kde_datadir)/kstars/
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kstars/