[Midnightbsd-cvs] mports [21530] trunk/devel/allegro/files: drop
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 5 20:29:00 EDT 2016
Revision: 21530
http://svnweb.midnightbsd.org/mports/?rev=21530
Author: laffer1
Date: 2016-08-05 20:28:59 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
drop
Removed Paths:
-------------
trunk/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in
trunk/devel/allegro/files/patch-aclocal.m4
trunk/devel/allegro/files/patch-configure.in
trunk/devel/allegro/files/patch-makefile.in
trunk/devel/allegro/files/patch-misc::allegro-config.in
trunk/devel/allegro/files/patch-misc::deplib.sh
Deleted: trunk/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in
===================================================================
--- trunk/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in 2016-08-06 00:27:08 UTC (rev 21529)
+++ trunk/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in 2016-08-06 00:28:59 UTC (rev 21530)
@@ -1,43 +0,0 @@
---- include/allegro/inline/fmaths.inl.orig Sun Jun 5 18:23:46 2005
-+++ include/allegro/inline/fmaths.inl Thu Aug 11 18:53:53 2005
-@@ -103,40 +103,11 @@
-
- AL_INLINE(fixed, fixmul, (fixed x, fixed y),
- {
-- /* In benchmarks conducted circa May 2005 we found that, in the main:
-- * - IA32 machines performed faster with one implementation;
-- * - AMD64 and G4 machines performed faster with another implementation.
-- *
-- * Benchmarks were mainly done with differing versions of gcc.
-- * Results varied with other compilers, optimisation levels, etc.
-- * so this is not optimal, though a tenable compromise.
-- */
-- #if (defined ALLEGRO_I386) || (!defined LONG_LONG)
--
-- fixed sign = (x^y) & 0x80000000;
-- int mask_x = x >> 31;
-- int mask_y = y >> 31;
-- int mask_result = sign >> 31;
-- fixed result;
--
-- x = (x^mask_x) - mask_x;
-- y = (y^mask_y) - mask_y;
--
-- result = ((y >> 8)*(x >> 8) +
-- (((y >> 8)*(x&0xff)) >> 8) +
-- (((x >> 8)*(y&0xff)) >> 8));
--
-- return (result^mask_result) - mask_result;
--
-- #else
--
- LONG_LONG lx = x;
- LONG_LONG ly = y;
- LONG_LONG lres = (lx*ly)>>16;
- int res = lres;
- return res;
--
-- #endif
- })
-
-
Deleted: trunk/devel/allegro/files/patch-aclocal.m4
===================================================================
--- trunk/devel/allegro/files/patch-aclocal.m4 2016-08-06 00:27:08 UTC (rev 21529)
+++ trunk/devel/allegro/files/patch-aclocal.m4 2016-08-06 00:28:59 UTC (rev 21530)
@@ -1,26 +0,0 @@
---- aclocal.m4.orig 2007-06-16 01:52:28.000000000 +0000
-+++ aclocal.m4 2008-07-14 15:10:32.000000000 +0000
-@@ -195,3 +195,2 @@
- dnl
--AC_MSG_CHECKING(for System V sys/procfs)
- AC_DEFUN(ALLEGRO_ACTEST_SV_PROCFS, [
-@@ -211,3 +210,2 @@
- ])
--AC_MSG_RESULT($allegro_sv_procfs)
-
-@@ -219,3 +217,2 @@
- dnl
--AC_MSG_CHECKING(if sys/procfs.h tells us argc/argv)
- AC_DEFUN(ALLEGRO_ACTEST_PROCFS_ARGCV, [
-@@ -228,3 +225,2 @@
- ])
--AC_MSG_RESULT($allegro_procfs_argcv)
-
-@@ -236,3 +232,2 @@
- dnl
--AC_MSG_CHECKING(for getexecname)
- AC_DEFUN(ALLEGRO_ACTEST_SYS_GETEXECNAME,
-@@ -242,3 +237,2 @@
- )
--AC_MSG_RESULT($allegro_sys_getexecname)
-
Deleted: trunk/devel/allegro/files/patch-configure.in
===================================================================
--- trunk/devel/allegro/files/patch-configure.in 2016-08-06 00:27:08 UTC (rev 21529)
+++ trunk/devel/allegro/files/patch-configure.in 2016-08-06 00:28:59 UTC (rev 21530)
@@ -1,32 +0,0 @@
---- configure.in.orig Sun Jun 12 04:53:19 2005
-+++ configure.in Fri Aug 5 15:09:10 2005
-@@ -297,8 +297,8 @@
- allegro_static_libraries=yes
- _programs="statically linked $_programs"
- else
-- LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
-- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
-+ LIBALLEG="lib/unix/lib${LIB_TO_LINK}.so.\$(shared_version) lib/unix/lib${LIB_TO_LINK}_unsharable.a"
-+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK} -l${LIB_TO_LINK}_unsharable -lm"
- LINK_WITH_STATIC_LIBS=no
- allegro_shared_libraries=yes
- _programs="dynamically linked $_programs"
-@@ -337,15 +337,15 @@
-
- _libraries="$_libraries shared"
- if test "X$allegro_build_normal_library" = "Xyes"; then
-- ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg-\$(shared_version).so lib/unix/liballeg_unsharable.a"
-+ ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg.so.\$(shared_version) lib/unix/liballeg_unsharable.a"
- _libraries="$_libraries release"
- fi
- if test "X$allegro_build_debugging_library" = "Xyes"; then
-- ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd-\$(shared_version).so lib/unix/liballd_unsharable.a"
-+ ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd.so.\$(shared_version) lib/unix/liballd_unsharable.a"
- _libraries="$_libraries debug"
- fi
- if test "X$allegro_build_profiling_library" = "Xyes"; then
-- ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp-\$(shared_version).so lib/unix/liballp_unsharable.a"
-+ ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp.so.\$(shared_version) lib/unix/liballp_unsharable.a"
- _libraries="$_libraries profile"
- fi
- fi
Deleted: trunk/devel/allegro/files/patch-makefile.in
===================================================================
--- trunk/devel/allegro/files/patch-makefile.in 2016-08-06 00:27:08 UTC (rev 21529)
+++ trunk/devel/allegro/files/patch-makefile.in 2016-08-06 00:28:59 UTC (rev 21530)
@@ -1,135 +0,0 @@
---- makefile.in.orig 2007-07-22 00:55:54.000000000 -0500
-+++ makefile.in 2011-03-25 17:23:23.000000000 -0500
-@@ -31,4 +31,4 @@
-
--ACLOCAL = aclocal
--AUTOCONF = autoconf
-+ACLOCAL = true
-+AUTOCONF = true
-
-@@ -36,2 +36,3 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -355,2 +356,7 @@
- lib: $(ALLEGRO_LIB_TARGETS)
-+ @for l in alleg alld allp; do \
-+ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \
-+ ln -sf lib$${l}.so.$(shared_version) $(LIBDIR)/lib$${l}.so; \
-+ fi; \
-+ done
-
-@@ -399,43 +405,43 @@
- # -------- rules for deleting the generated files --------
--
--clean:
--
-- define RM_OBJ_CLEAN_FILES
-- $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
-- )
-- endef
--
-- define RM_OTHER_CLEAN_FILES
-- $(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file)
-- )
-- endef
--
-- $(RM_OBJ_CLEAN_FILES)
-- $(RM_OTHER_CLEAN_FILES)
--
--distclean: clean
--
-- define RM_DISTCLEAN_FILES
-- $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
-- )
-- endef
--
-- $(RM_DISTCLEAN_FILES)
--
--veryclean: distclean
--
-- define RM_VERYCLEAN_FILES
-- $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
-- )
-- endef
--
-- $(RM_VERYCLEAN_FILES)
-- rm -f makefile
--
--maintainer-clean: veryclean
-- rm -f configure include/allegro/platform/alunixac.hin
-- rm -rf autom4te*
--
--
--
-+# XXX: whacked out with gmake 3.82
-+# clean:
-+#
-+# define RM_OBJ_CLEAN_FILES
-+# $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
-+# )
-+# endef
-+#
-+# define RM_OTHER_CLEAN_FILES
-+# $(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file)
-+# )
-+# endef
-+#
-+# $(RM_OBJ_CLEAN_FILES)
-+# $(RM_OTHER_CLEAN_FILES)
-+#
-+# distclean: clean
-+#
-+# define RM_DISTCLEAN_FILES
-+# $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
-+# )
-+# endef
-+#
-+# $(RM_DISTCLEAN_FILES)
-+#
-+# veryclean: distclean
-+#
-+# define RM_VERYCLEAN_FILES
-+# $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
-+# )
-+# endef
-+#
-+# $(RM_VERYCLEAN_FILES)
-+# rm -f makefile
-+#
-+# maintainer-clean: veryclean
-+# rm -f configure include/allegro/platform/alunixac.hin
-+# rm -rf autom4te*
-+#
-+#
-+#
- # -------- rules for installing the files --------
-@@ -466,5 +472,5 @@
- @for l in alleg alld allp; do \
-- if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
-- echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
-- $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
-+ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \
-+ echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \
-+ $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(DESTDIR)$(libdir)/; \
- $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
-@@ -482,16 +488,6 @@
- @echo Installing allegro-config to $(DESTDIR)$(bindir)
-- @$(INSTALL_PROGRAM) allegro-config $(DESTDIR)$(bindir)
-- @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
-- (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
-- test $(libdir) = /lib || test $(libdir) = /usr/lib) \
-- && ($(LDCONFIG) $(libdir) || true) || (\
-- echo "" ; \
-- echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \
-- echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \
-- echo "$(libdir) each time you want to run an Allegro program." ; \
-- ) ; \
-- fi
-+ @$(INSTALL_SCRIPT) allegro-config $(DESTDIR)$(bindir)
- @for l in alleg alld allp; do \
-- if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
-- (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
-+ if test -f $(DESTDIR)$(libdir)/lib$${l}.so.$(shared_version) -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so; then \
-+ (cd $(DESTDIR)$(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
- fi; \
Deleted: trunk/devel/allegro/files/patch-misc::allegro-config.in
===================================================================
--- trunk/devel/allegro/files/patch-misc::allegro-config.in 2016-08-06 00:27:08 UTC (rev 21529)
+++ trunk/devel/allegro/files/patch-misc::allegro-config.in 2016-08-06 00:28:59 UTC (rev 21530)
@@ -1,11 +0,0 @@
---- misc/allegro-config.in.orig Wed Oct 23 08:10:01 2002
-+++ misc/allegro-config.in Mon Nov 11 18:41:09 2002
-@@ -167,7 +167,7 @@
- if test "$static_libs" = "yes"; then
- echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
- else
-- echo $libdirs $allegro_ldflags -l${lib_type}-${version} -l${lib_type}_unsharable
-+ echo $libdirs $allegro_ldflags -l${lib_type} -l${lib_type}_unsharable
- fi
- fi
-
Deleted: trunk/devel/allegro/files/patch-misc::deplib.sh
===================================================================
--- trunk/devel/allegro/files/patch-misc::deplib.sh 2016-08-06 00:27:08 UTC (rev 21529)
+++ trunk/devel/allegro/files/patch-misc::deplib.sh 2016-08-06 00:28:59 UTC (rev 21530)
@@ -1,20 +0,0 @@
---- misc/deplib.sh.orig Sun Nov 9 19:43:07 2003
-+++ misc/deplib.sh Thu Dec 11 22:32:16 2003
-@@ -10,7 +10,7 @@
- staticlib="lib${1}.a"
- staticobj="\$(${2}_OBJECTS)"
-
-- sharelib="lib${1}-\$(shared_version).so"
-+ sharelib="lib${1}.so.\$(shared_version)"
- shareobj="\$(${2}_SHARED_OBJECTS)"
-
- unsharelib="lib${1}_unsharable.a"
-@@ -24,7 +24,7 @@
- echo " rm -f \$@"
- # gf: This bit is obviously gcc-specific
- # eb: Yes, but the GNU C Compiler doesn't always spell 'gcc'
-- echo " \$(CC) -shared -o \$@ ${shareobj} ${3} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)"
-+ echo " \$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_version) \$(LIBS)"
- echo ""
- echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}"
- echo " rm -f \$@"
More information about the Midnightbsd-cvs
mailing list