Date: Sun, 7 Jul 2013 23:05:23 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322466 - head/x11-wm/afterstep-stable/files Message-ID: <201307072305.r67N5N8O073015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Jul 7 23:05:22 2013 New Revision: 322466 URL: http://svnweb.freebsd.org/changeset/ports/322466 Log: . More portlint petting (fix patch file names). Added: - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-afterstep::Makefile.in - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterBase::audit.c - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterBase::configure - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterConf::Makefile.in - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterImage::configure - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::xmlproc.c - copied unchanged from r322399, head/x11-wm/afterstep-stable/files/patch-src::WinCommand::WinCommand.c Directory Properties: head/x11-wm/afterstep-stable/files/patch-afterstep-Makefile.in (props changed) head/x11-wm/afterstep-stable/files/patch-libAfterBase-audit.c (props changed) head/x11-wm/afterstep-stable/files/patch-libAfterBase-configure (props changed) head/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in (props changed) head/x11-wm/afterstep-stable/files/patch-libAfterImage-configure (props changed) head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-Makefile.in (props changed) head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-xmlproc.c (props changed) head/x11-wm/afterstep-stable/files/patch-src-WinCommand-WinCommand.c (props changed) Deleted: head/x11-wm/afterstep-stable/files/patch-afterstep::Makefile.in head/x11-wm/afterstep-stable/files/patch-libAfterBase::audit.c head/x11-wm/afterstep-stable/files/patch-libAfterBase::configure head/x11-wm/afterstep-stable/files/patch-libAfterConf::Makefile.in head/x11-wm/afterstep-stable/files/patch-libAfterImage::configure head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::xmlproc.c head/x11-wm/afterstep-stable/files/patch-src::WinCommand::WinCommand.c Copied: head/x11-wm/afterstep-stable/files/patch-afterstep-Makefile.in (from r322399, head/x11-wm/afterstep-stable/files/patch-afterstep::Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-afterstep-Makefile.in Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-afterstep::Makefile.in) @@ -0,0 +1,25 @@ +$FreeBSD$ + +--- afterstep/Makefile.in.orig Tue Jul 10 22:25:39 2007 ++++ afterstep/Makefile.in Tue Jul 10 22:26:53 2007 +@@ -29,19 +29,7 @@ + fi + + install.data_reinstall: remove_old +- @$(RMF) no_data_reinstall ; \ +- if [ -d $(AFTER_SHAREDIR) ] ; then \ +- echo $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \ +- $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \ +- if [ -d $(AFTER_SHAREDIR)_old/desktop -a -d $(AFTER_SHAREDIR)_old/desktop/tiles ] ; then \ +- no_data_reinstall=$(NO_DATA_REINSTALL); \ +- fi; \ +- if [ -n "$$no_data_reinstall" ]; then \ +- touch no_data_reinstall; \ +- fi; \ +- else \ +- echo "no previous installation detected"; \ +- fi ++ @$(RMF) no_data_reinstall + + share_dirs: + $(MKDIR) -p $(AFTER_SHAREDIR) Copied: head/x11-wm/afterstep-stable/files/patch-libAfterBase-audit.c (from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterBase::audit.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-libAfterBase-audit.c Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-libAfterBase::audit.c) @@ -0,0 +1,59 @@ +--- libAfterBase/audit.c.orig Sat Sep 25 03:45:27 2004 ++++ libAfterBase/audit.c Wed Sep 29 15:36:51 2004 +@@ -498,7 +498,7 @@ + #else + /*fprintf( stderr, "%s: freeing %p at %s:%d\n", __FUNCTION__, m->ptr, fname, line );*/ + safefree (m->ptr); +- mem_destroy( (ASHashableValue)NULL, m ); ++ mem_destroy( (ASHashableValue)(void*)NULL, m ); + #endif + } + +@@ -817,7 +817,7 @@ + */ + + XFreePixmap (display, pmap); +- mem_destroy( (ASHashableValue)NULL, m ); ++ mem_destroy( (ASHashableValue)(void*)NULL, m ); + return Success; + } + +@@ -852,7 +852,7 @@ + } + + XFreeGC (display, gc); +- mem_destroy( (ASHashableValue)NULL, m ); ++ mem_destroy( (ASHashableValue)(void*)NULL, m ); + return Success; + } + +@@ -931,17 +931,17 @@ + /* can also be of C_MEM type if we allocated it ourselvs */ + m = count_find_and_extract (fname, line, (void *)image, C_MEM); + if (m) +- mem_destroy( (ASHashableValue)NULL, m ); ++ mem_destroy( (ASHashableValue)(void*)NULL, m ); + + /* find and free the image->data pointer if it is in our list */ + if( image_data ) + if ((m = count_find_and_extract (fname, line, image_data, C_MEM)) != NULL) +- mem_destroy( (ASHashableValue)NULL, m ); ++ mem_destroy( (ASHashableValue)(void*)NULL, m ); + + /* find and free the image->obdata pointer if it is in our list */ + if( image_obdata ) + if ((m = count_find_and_extract (fname, line, image_obdata, C_MEM)) != NULL) +- mem_destroy( (ASHashableValue)NULL, m ); ++ mem_destroy( (ASHashableValue)(void*)NULL, m ); + + return Success; + } +@@ -1140,7 +1140,7 @@ + } + + XFree (data); +- mem_destroy( (ASHashableValue)NULL, m ); ++ mem_destroy( (ASHashableValue)(void*)NULL, m ); + return Success; + } + Copied: head/x11-wm/afterstep-stable/files/patch-libAfterBase-configure (from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterBase::configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-libAfterBase-configure Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-libAfterBase::configure) @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- libAfterBase/configure.orig Thu Jul 12 15:39:55 2007 ++++ libAfterBase/configure Sun Oct 28 20:22:55 2007 +@@ -6381,6 +6381,8 @@ + + + ++execinfo_libs="-L%%LOCALBASE%%/lib -lexecinfo" ++LIBS="$execinfo_libs $LIBS" + for ac_func in backtrace_symbols_fd backtrace_symbols backtrace + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` Copied: head/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in (from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterConf::Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-libAfterConf::Makefile.in) @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- libAfterConf/Makefile.in.orig Sat Jun 24 22:04:08 2006 ++++ libAfterConf/Makefile.in Sat Jun 24 22:04:21 2006 +@@ -3,7 +3,7 @@ + # + + LIBS_PRIVATE = ../libAfterConf/libAfterConf.a ../libAfterStep/libAfterStep.a\ +- ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a ++ ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a -L%%LOCALBASE%%/lib -lexecinfo + + LIB_INCS= afterconf.h + Copied: head/x11-wm/afterstep-stable/files/patch-libAfterImage-configure (from r322399, head/x11-wm/afterstep-stable/files/patch-libAfterImage::configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-libAfterImage-configure Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-libAfterImage::configure) @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- libAfterImage/configure.orig Thu Jun 22 21:27:08 2006 ++++ libAfterImage/configure Thu Jun 22 21:27:53 2006 +@@ -8443,9 +8443,9 @@ + HAVE_AFTERBASE_FLAG=1 + AFTERBASE_C= + if test "x$have_x" != "xyes" -a "x$have_gif" = "xyes"; then +- AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase" ++ AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase -L%%LOCALBASE%%/lib -lexecinfo" + else +- AFTERIMAGE_LIBS="-lAfterBase $AFTERIMAGE_LIBS" ++ AFTERIMAGE_LIBS="-lAfterBase -L%%LOCALBASE%%/lib -lexecinfo $AFTERIMAGE_LIBS" + fi + if test -r "../libAfterBase/astypes.h"; then + AFTERIMAGE_APPS_LIBS="-L../ -L../../libAfterBase -lAfterImage $AFTERIMAGE_LIBS" Copied: head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-Makefile.in (from r322399, head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-Makefile.in Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in) @@ -0,0 +1,20 @@ +$FreeBSD$ + +--- src/ASDocGen/Makefile.in.orig 2008-03-24 23:58:23.000000000 -0700 ++++ src/ASDocGen/Makefile.in 2008-03-25 00:01:05.000000000 -0700 +@@ -55,14 +55,7 @@ + for f in `ls *.man`; do \ + page_name=`echo $$f| awk -F . '{print $$1}'`; \ + echo -n "$$f "; \ +- $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \ +- done; echo "Done"; \ +- cd API; echo "Installing API man pages using command - " ; \ +- echo " \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_API_DIR)/<name>.3x\""; \ +- for f in `ls *.man`; do \ +- page_name=`echo $$f| awk -F . '{print $$1}'`; \ +- echo -n "$$f "; \ +- $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \ ++ $(INSTALL_DATA) "$$page_name.man" $(AFTER_MAN_DIR)/$$page_name.1x; \ + done; echo "Done"; \ + cd ../.. + Copied: head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-xmlproc.c (from r322399, head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::xmlproc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-xmlproc.c Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-src::ASDocGen::xmlproc.c) @@ -0,0 +1,14 @@ +--- src/ASDocGen/xmlproc.c.orig 2008-09-15 15:54:38.000000000 +0000 ++++ src/ASDocGen/xmlproc.c 2008-09-15 16:00:20.000000000 +0000 +@@ -504,9 +504,10 @@ + char *target = NULL, *target2 ; + char *term = NULL, *term2 ; + char *ptr = &(state->dest_file[strlen(state->dest_file)-4]); ++ size_t curr_url_anchor_len = state->curr_url_anchor ? strlen(state->curr_url_anchor) : 0; + if( state->doc_type == DocType_PHP && *ptr == '.') + *ptr = '\0' ; +- target = safemalloc( strlen( state->dest_file)+5+1+strlen(state->curr_url_anchor)+1); ++ target = safemalloc( strlen( state->dest_file)+5+1+curr_url_anchor_len+1); + sprintf( target, "%s#%s", state->dest_file, state->curr_url_anchor ); + if( state->doc_type == DocType_PHP && *ptr == '\0' ) + *ptr = '.' ; Copied: head/x11-wm/afterstep-stable/files/patch-src-WinCommand-WinCommand.c (from r322399, head/x11-wm/afterstep-stable/files/patch-src::WinCommand::WinCommand.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-src-WinCommand-WinCommand.c Sun Jul 7 23:05:22 2013 (r322466, copy of r322399, head/x11-wm/afterstep-stable/files/patch-src::WinCommand::WinCommand.c) @@ -0,0 +1,20 @@ +$FreeBSD$ + +--- src/WinCommand/WinCommand.c.orig Sat Jun 24 22:08:22 2006 ++++ src/WinCommand/WinCommand.c Sat Jun 24 22:09:07 2006 +@@ -307,12 +307,13 @@ + ASBiDirElem *curr; + char *command; + action_t *a; +- ASWinCommandState WinCommandState ; ++ ASWinCommandState WinCommandState ; ++ ASBiDirList *operations; + + InitMyApp (CLASS_WINCOMMAND, argc, argv, NULL, NULL, OPTION_SINGLE|OPTION_RESTART ); + ConnectX( ASDefaultScr, 0 ); + +- ASBiDirList *operations = create_asbidirlist( NULL ); ++ operations = create_asbidirlist( NULL ); + + /* Initialize State */ + memset( &WinCommandState, 0x00, sizeof(WinCommandState));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307072305.r67N5N8O073015>