mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
2013-01-04 ports-mgmt/portmanager: Does not support modern ports features such as MOVED, is lacking upstream and active contributions, and does not support pkgng. Consider using ports-mgmt/portmaster, ports-mgmt/portupgrade or pkgng.
2013-01-04 net-im/openfetion: Abandoned upstream 2013-01-04 textproc/libpathan: Does not build and upstream has discontinued the project and advises that it has been replaced by textproc/xqilla 2013-01-01 java/sun-wtk: no more public distfiles, merged with Java ME SDK 3.0 upstream
This commit is contained in:
parent
7c54981358
commit
ee3b71ca87
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=309992
49 changed files with 4 additions and 3972 deletions
1
LEGAL
1
LEGAL
|
@ -238,7 +238,6 @@ idea.V*.tar.Z security/idea A patented algorithm that
|
|||
requires proper licensing
|
||||
iperf-* benchmarks/iperf Cannot charge a fee for the
|
||||
software
|
||||
j2me_wireless_toolkit* java/sun-wtk No redistribution allowed
|
||||
jdk-6*-i586.bin java/linux-sun-jdk16 Redistribution of repackaged
|
||||
binaries not permitted
|
||||
jdk-7*-i586.tar.gz java/linux-sun-jdk17 Redistribution of repackaged
|
||||
|
|
4
MOVED
4
MOVED
|
@ -3997,3 +3997,7 @@ mail/horde4-webmail|mail/horde-webmail|2012-12-18|Move horde4-* apps to horde-*
|
|||
textproc/hs-xml2html||2012-12-20|Removed: this package is obsolete
|
||||
sysutils/makefs||2012-12-21|Has expired: Part of base in an earlier version for every supported FreeBSD version
|
||||
textproc/docproj-jadetex||2013-01-03|Removed: Deprecated in favor of textproc/docproj
|
||||
ports-mgmt/portmanager||2013-01-06|Has expired: Does not support modern ports features such as MOVED, is lacking upstream and active contributions, and does not support pkgng. Consider using ports-mgmt/portmaster, ports-mgmt/portupgrade or pkgng.
|
||||
net-im/openfetion||2013-01-06|Has expired: Abandoned upstream
|
||||
textproc/libpathan||2013-01-06|Has expired: Does not build and upstream has discontinued the project and advises that it has been replaced by textproc/xqilla
|
||||
java/sun-wtk||2013-01-06|Has expired: no more public distfiles, merged with Java ME SDK 3.0 upstream
|
||||
|
|
|
@ -141,7 +141,6 @@
|
|||
SUBDIR += springframework
|
||||
SUBDIR += sqlitejdbc
|
||||
SUBDIR += subversion-java
|
||||
SUBDIR += sun-wtk
|
||||
SUBDIR += trove4j
|
||||
SUBDIR += veditor
|
||||
SUBDIR += xdoclet
|
||||
|
|
|
@ -1,67 +0,0 @@
|
|||
# Created by: Panagiotis Astithas <past@noc.ntua.gr>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= wtk
|
||||
PORTVERSION= 2.2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= #
|
||||
PKGNAMEPREFIX= sun-
|
||||
DISTNAME= j2me_wireless_toolkit-${PORTVERSION:S/./_/}-linux-i386
|
||||
EXTRACT_SUFX= .bin
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= Sun J2ME Wireless Toolkit
|
||||
|
||||
DEPRECATED= no more public distfiles, merged with Java ME SDK 3.0 upstream
|
||||
EXPIRATION_DATE= 2013-01-01
|
||||
|
||||
EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
|
||||
|
||||
USE_LINUX= yes
|
||||
USE_JAVA= yes
|
||||
JAVA_VERSION= 1.6+
|
||||
NO_BUILD= yes
|
||||
DOWNLOAD_URL= https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=j2me_wireless_toolkit-${PORTVERSION:S/./_/}-oth-JPR@CDS-CDS_Developer
|
||||
|
||||
RESTRICTED= License does not allow redistribution of any kind
|
||||
|
||||
SUB_FILES= pkg-message
|
||||
APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
|
||||
IGNORE=You must manually fetch the J2ME WTK self-extracting file for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
|
||||
.endif
|
||||
|
||||
do-extract:
|
||||
@${MKDIR} ${WRKDIR}
|
||||
@cd ${WRKDIR} \
|
||||
&& dd bs=1024 if=${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
|
||||
of=${WRKDIR}/j2mewtk-solaris.zip skip=20 2>/dev/null
|
||||
@${UNZIP_CMD} -qo ${WRKDIR}/j2mewtk-solaris.zip -d ${WRKSRC}
|
||||
@${FIND} ${WRKSRC} -type f -exec ${CHMOD} 0644 {} \+
|
||||
@${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \+
|
||||
@${FIND} ${WRKSRC}/bin ! -name '*.jar' -exec ${CHMOD} 0755 {} \;
|
||||
|
||||
do-patch:
|
||||
@${REINPLACE_CMD} -e "\
|
||||
s@javapathtowtk=.*@javapathtowtk=${JAVA_HOME}/bin/@; \
|
||||
s@/usr/bin/expr@/bin/expr@g" \
|
||||
${WRKSRC}/bin/defaultdevice ${WRKSRC}/bin/emulator \
|
||||
${WRKSRC}/bin/ktoolbar ${WRKSRC}/bin/prefs \
|
||||
${WRKSRC}/bin/utils ${WRKSRC}/bin/wscompile
|
||||
@${MV} ${WRKSRC}/wtklib/Linux ${WRKSRC}/wtklib/FreeBSD
|
||||
@${FIND} ${WRKSRC} -name '*.bak' -delete
|
||||
|
||||
do-install:
|
||||
@${MKDIR} ${APP_HOME}
|
||||
cd "${WRKSRC}" && ${FIND} . \
|
||||
| ${CPIO} -pdmu -R root:wheel "${APP_HOME}"
|
||||
@${LN} -sf ${APP_HOME}/bin/ktoolbar ${PREFIX}/bin/ktoolbar
|
||||
|
||||
post-install:
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
|
||||
.include <bsd.port.post.mk>
|
|
@ -1,2 +0,0 @@
|
|||
SHA256 (j2me_wireless_toolkit-2_2-linux-i386.bin) = 4480bea914a4537ea81a5a70c517f91aa5a567915f470e70e050c332bfdd4d34
|
||||
SIZE (j2me_wireless_toolkit-2_2-linux-i386.bin) = 17637106
|
|
@ -1,10 +0,0 @@
|
|||
================================================================
|
||||
Documentation for the J2ME Wireless Toolkit version 2.2 is in
|
||||
the file %%PREFIX%%/index.html
|
||||
|
||||
In order to start using the J2ME Wireless Toolkit, please run
|
||||
%%PREFIX%%/bin/ktoolbar. Please read the documentation for
|
||||
instructions on setting up ~/ktools.properties to use a local
|
||||
copy of the provided examples.
|
||||
================================================================
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
The Sun JavaTM 2 Platform, Micro Edition (J2METM) Wireless Toolkit
|
||||
supports the development of Java applications that run on devices
|
||||
compliant with the Java Technology for the Wireless Industry
|
||||
specification. The implementation included in version 2.2 is
|
||||
compliant with Connected Limited Device Configuration 1.1 (CLDC),
|
||||
Mobile Information Device Profile 2.0 (MIDP), Wireless Messaging
|
||||
APIs (WMA), version 1.1, and Mobile Media APIs (MMAPI), version 1.1.
|
||||
Support for J2ME Web Services (JSR-172), version 1.0 is also included.
|
||||
|
||||
WWW: http://java.sun.com/j2me/
|
File diff suppressed because it is too large
Load diff
|
@ -80,7 +80,6 @@
|
|||
SUBDIR += msn-proxy
|
||||
SUBDIR += mu-conference
|
||||
SUBDIR += naim
|
||||
SUBDIR += openfetion
|
||||
SUBDIR += openfire
|
||||
SUBDIR += openfire-devel
|
||||
SUBDIR += p5-AnyEvent-XMPP
|
||||
|
|
|
@ -1,70 +0,0 @@
|
|||
# New ports collection makefile for: openfetion
|
||||
# Date created: 11 December 2010
|
||||
# Whom: Yanhui Shen <shen.elf@gmail.com>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= openfetion
|
||||
PORTVERSION= 2.0.7
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= net-im
|
||||
MASTER_SITES= GOOGLE_CODE
|
||||
|
||||
MAINTAINER= shen.elf@gmail.com
|
||||
COMMENT= An open source client for China Mobile's Fetion IM
|
||||
|
||||
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
|
||||
|
||||
DEPRECATED= Abandoned upstream
|
||||
EXPIRATION_DATE= 2013-01-04
|
||||
OPTIONS= XSCREENSAVER "Enable X screensaver extension" on \
|
||||
NOTIFY "Enable libnotify support" on \
|
||||
GSTREAMER "Enable gstreamer support" on
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_GMAKE= yes
|
||||
USE_GETTEXT= yes
|
||||
USE_GNOME= gnomehack glib20 gtk20 libxml2 desktopfileutils
|
||||
USE_OPENSSL= yes
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFIGURE_ARGS=--disable-nm
|
||||
CONFIGURE_ENV= LIBSSL_CFLAGS=-Wl,-rpath,${OPENSSLRPATH} \
|
||||
LIBSSL_LIBS=-rpath=${OPENSSLRPATH}
|
||||
|
||||
PROJECTHOST= ofetion
|
||||
LICENSE= GPLv2
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if !defined(WITHOUT_XSCREENSAVER)
|
||||
USE_XORG= xscrnsaver
|
||||
CONFIGURE_ARGS+=--enable-screensaver
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-screensaver
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_GSTREAMER)
|
||||
USE_GSTREAMER= yes
|
||||
CONFIGURE_ARGS+=--enable-gst
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-gst
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_NOTIFY)
|
||||
LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify
|
||||
CONFIGURE_ARGS+=--enable-libnotify
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-libnotify
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(itlocaledir)|$${datarootdir}/locale|g' \
|
||||
${WRKSRC}/po/Makefile.in.in
|
||||
@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/resource/Makefile.in
|
||||
|
||||
post-install:
|
||||
@-update-desktop-database
|
||||
|
||||
.include <bsd.port.mk>
|
|
@ -1,2 +0,0 @@
|
|||
SHA256 (openfetion-2.0.7.tar.gz) = 37bdab942713512ab02d34e1b16a810764e55688c93cd5daee88c64c50c22695
|
||||
SIZE (openfetion-2.0.7.tar.gz) = 794386
|
|
@ -1,75 +0,0 @@
|
|||
--- lib/fetion_connection.c.orig 2010-11-28 20:53:01.000000000 +0900
|
||||
+++ lib/fetion_connection.c 2010-12-12 11:56:42.000000000 +0900
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
+#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <arpa/inet.h>
|
||||
@@ -34,9 +35,15 @@
|
||||
int tcp_keep_alive(int socketfd)
|
||||
{
|
||||
int keepAlive = 1;
|
||||
+#ifdef TCP_KEEPIDEL
|
||||
int keepIdle = 10;
|
||||
+#endif
|
||||
+#ifdef TCP_KEEPINTVL
|
||||
int keepInterval = 10;
|
||||
+#endif
|
||||
+#ifdef TCP_KEEPCNT
|
||||
int keepCount = 10;
|
||||
+#endif
|
||||
|
||||
if(setsockopt(socketfd , SOL_SOCKET , SO_KEEPALIVE
|
||||
,(void*)&keepAlive,sizeof(keepAlive)) == -1){
|
||||
@@ -44,23 +51,29 @@
|
||||
return -1;
|
||||
}
|
||||
|
||||
+#ifdef TCP_KEEPIDEL
|
||||
if(setsockopt(socketfd , SOL_TCP , TCP_KEEPIDLE
|
||||
,(void *)&keepIdle,sizeof(keepIdle)) == -1){
|
||||
debug_info("set TCP_KEEPIDEL failed\n");
|
||||
return -1;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#ifdef TCP_KEEPINTVL
|
||||
if(setsockopt(socketfd , SOL_TCP , TCP_KEEPINTVL
|
||||
,(void *)&keepInterval,sizeof(keepInterval)) == -1){
|
||||
debug_info("set TCP_KEEPINTVL failed\n");
|
||||
return -1;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#ifdef TCP_KEEPCNF
|
||||
if(setsockopt(socketfd , SOL_TCP , TCP_KEEPCNT
|
||||
,(void *)&keepCount,sizeof(keepCount)) == -1){
|
||||
debug_info("set TCP_KEEPCNT failed\n");
|
||||
return -1;
|
||||
}
|
||||
+#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -369,10 +382,16 @@
|
||||
c = tcp_connection_recv(conn , buf , sizeof(buf) - 1);
|
||||
if(c <= 0)
|
||||
break;
|
||||
- strcpy(res + n, buf);
|
||||
n += c;
|
||||
- if(n >= len)
|
||||
+ if(n > len){
|
||||
+ free(res);
|
||||
+ res = NULL;
|
||||
break;
|
||||
+ }
|
||||
+ strcpy(res + n -c, buf);
|
||||
+ if(n == len){
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
return res;
|
|
@ -1,12 +0,0 @@
|
|||
--- src/fx_conn.c.orig 2010-11-28 20:53:01.000000000 +0900
|
||||
+++ src/fx_conn.c 2010-12-12 11:56:42.000000000 +0900
|
||||
@@ -24,8 +24,8 @@
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <arpa/inet.h>
|
||||
-#include <net/if.h>
|
||||
#include <sys/socket.h>
|
||||
+#include <net/if.h>
|
||||
#include <netdb.h>
|
||||
|
||||
int old_state;
|
|
@ -1,13 +0,0 @@
|
|||
--- src/fx_main.c.orig 2011-08-12 14:28:22.000000000 +0200
|
||||
+++ src/fx_main.c 2011-08-12 14:28:39.000000000 +0200
|
||||
@@ -124,8 +124,8 @@ void fx_main_initialize(FxMain* fxmain)
|
||||
SKIN_DIR"offline.svg");
|
||||
gtk_status_icon_set_tooltip(fxmain->trayIcon, "OpenFetion");
|
||||
#ifdef USE_LIBNOTIFY
|
||||
- fxmain->notify = notify_notification_new_with_status_icon("welcome"
|
||||
- , "" , NULL , fxmain->trayIcon);
|
||||
+ fxmain->notify = notify_notification_new("welcome"
|
||||
+ , "" , NULL);
|
||||
notify_notification_set_timeout(fxmain->notify , 2500);
|
||||
#endif
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
Fetion is an IM provided by China Mobile with features like text chat,
|
||||
voice call, file sharing, etc.
|
||||
Openfetion is an open source client of Fetion with limited features.
|
||||
It's small and fast, and it looks better.
|
||||
|
||||
WWW: http://code.google.com/p/ofetion/
|
|
@ -1,174 +0,0 @@
|
|||
bin/openfetion
|
||||
include/fetion_buddylist.h
|
||||
include/fetion_config.h
|
||||
include/fetion_connection.h
|
||||
include/fetion_contact.h
|
||||
include/fetion_conversation.h
|
||||
include/fetion_debug.h
|
||||
include/fetion_directsms.h
|
||||
include/fetion_group.h
|
||||
include/fetion_history.h
|
||||
include/fetion_list.h
|
||||
include/fetion_login.h
|
||||
include/fetion_message.h
|
||||
include/fetion_share.h
|
||||
include/fetion_sip.h
|
||||
include/fetion_types.h
|
||||
include/fetion_user.h
|
||||
include/openfetion.h
|
||||
lib/libofetion.a
|
||||
lib/libofetion.la
|
||||
lib/libofetion.so
|
||||
lib/libofetion.so.0
|
||||
libdata/pkgconfig/ofetion.pc
|
||||
share/applications/openfetion.desktop
|
||||
share/pixmaps/fetion.svg
|
||||
share/locale/zh_CN/LC_MESSAGES/openfetion.mo
|
||||
%%DATADIR%%/resource/city.xml
|
||||
%%DATADIR%%/resource/newmessage.wav
|
||||
%%DATADIR%%/resource/province.xml
|
||||
%%DATADIR%%/skin/LoadingImage.gif
|
||||
%%DATADIR%%/skin/add.png
|
||||
%%DATADIR%%/skin/away.svg
|
||||
%%DATADIR%%/skin/bigimage.png
|
||||
%%DATADIR%%/skin/busy.svg
|
||||
%%DATADIR%%/skin/delete.png
|
||||
%%DATADIR%%/skin/directsms.png
|
||||
%%DATADIR%%/skin/edit.png
|
||||
%%DATADIR%%/skin/emotion.png
|
||||
%%DATADIR%%/skin/exit.png
|
||||
%%DATADIR%%/skin/face_images/1.gif
|
||||
%%DATADIR%%/skin/face_images/10.gif
|
||||
%%DATADIR%%/skin/face_images/11.gif
|
||||
%%DATADIR%%/skin/face_images/12.gif
|
||||
%%DATADIR%%/skin/face_images/13.gif
|
||||
%%DATADIR%%/skin/face_images/14.gif
|
||||
%%DATADIR%%/skin/face_images/15.gif
|
||||
%%DATADIR%%/skin/face_images/16.gif
|
||||
%%DATADIR%%/skin/face_images/17.gif
|
||||
%%DATADIR%%/skin/face_images/18.gif
|
||||
%%DATADIR%%/skin/face_images/19.gif
|
||||
%%DATADIR%%/skin/face_images/2.gif
|
||||
%%DATADIR%%/skin/face_images/20.gif
|
||||
%%DATADIR%%/skin/face_images/21.gif
|
||||
%%DATADIR%%/skin/face_images/22.gif
|
||||
%%DATADIR%%/skin/face_images/23.gif
|
||||
%%DATADIR%%/skin/face_images/24.gif
|
||||
%%DATADIR%%/skin/face_images/25.gif
|
||||
%%DATADIR%%/skin/face_images/26.gif
|
||||
%%DATADIR%%/skin/face_images/27.gif
|
||||
%%DATADIR%%/skin/face_images/28.gif
|
||||
%%DATADIR%%/skin/face_images/29.gif
|
||||
%%DATADIR%%/skin/face_images/3.gif
|
||||
%%DATADIR%%/skin/face_images/30.gif
|
||||
%%DATADIR%%/skin/face_images/31.gif
|
||||
%%DATADIR%%/skin/face_images/32.gif
|
||||
%%DATADIR%%/skin/face_images/33.gif
|
||||
%%DATADIR%%/skin/face_images/34.gif
|
||||
%%DATADIR%%/skin/face_images/35.gif
|
||||
%%DATADIR%%/skin/face_images/36.gif
|
||||
%%DATADIR%%/skin/face_images/37.gif
|
||||
%%DATADIR%%/skin/face_images/38.gif
|
||||
%%DATADIR%%/skin/face_images/39.gif
|
||||
%%DATADIR%%/skin/face_images/4.gif
|
||||
%%DATADIR%%/skin/face_images/40.gif
|
||||
%%DATADIR%%/skin/face_images/41.gif
|
||||
%%DATADIR%%/skin/face_images/42.gif
|
||||
%%DATADIR%%/skin/face_images/43.gif
|
||||
%%DATADIR%%/skin/face_images/44.gif
|
||||
%%DATADIR%%/skin/face_images/45.gif
|
||||
%%DATADIR%%/skin/face_images/46.gif
|
||||
%%DATADIR%%/skin/face_images/47.gif
|
||||
%%DATADIR%%/skin/face_images/48.gif
|
||||
%%DATADIR%%/skin/face_images/49.gif
|
||||
%%DATADIR%%/skin/face_images/5.gif
|
||||
%%DATADIR%%/skin/face_images/50.gif
|
||||
%%DATADIR%%/skin/face_images/51.gif
|
||||
%%DATADIR%%/skin/face_images/52.gif
|
||||
%%DATADIR%%/skin/face_images/6.gif
|
||||
%%DATADIR%%/skin/face_images/7.gif
|
||||
%%DATADIR%%/skin/face_images/8.gif
|
||||
%%DATADIR%%/skin/face_images/9.gif
|
||||
%%DATADIR%%/skin/face_images/big_1.gif
|
||||
%%DATADIR%%/skin/face_images/big_10.gif
|
||||
%%DATADIR%%/skin/face_images/big_11.gif
|
||||
%%DATADIR%%/skin/face_images/big_12.gif
|
||||
%%DATADIR%%/skin/face_images/big_13.gif
|
||||
%%DATADIR%%/skin/face_images/big_14.gif
|
||||
%%DATADIR%%/skin/face_images/big_15.gif
|
||||
%%DATADIR%%/skin/face_images/big_16.gif
|
||||
%%DATADIR%%/skin/face_images/big_17.gif
|
||||
%%DATADIR%%/skin/face_images/big_18.gif
|
||||
%%DATADIR%%/skin/face_images/big_19.gif
|
||||
%%DATADIR%%/skin/face_images/big_2.gif
|
||||
%%DATADIR%%/skin/face_images/big_20.gif
|
||||
%%DATADIR%%/skin/face_images/big_21.gif
|
||||
%%DATADIR%%/skin/face_images/big_22.gif
|
||||
%%DATADIR%%/skin/face_images/big_23.gif
|
||||
%%DATADIR%%/skin/face_images/big_24.gif
|
||||
%%DATADIR%%/skin/face_images/big_25.gif
|
||||
%%DATADIR%%/skin/face_images/big_26.gif
|
||||
%%DATADIR%%/skin/face_images/big_27.gif
|
||||
%%DATADIR%%/skin/face_images/big_28.gif
|
||||
%%DATADIR%%/skin/face_images/big_29.gif
|
||||
%%DATADIR%%/skin/face_images/big_3.gif
|
||||
%%DATADIR%%/skin/face_images/big_30.gif
|
||||
%%DATADIR%%/skin/face_images/big_31.gif
|
||||
%%DATADIR%%/skin/face_images/big_32.gif
|
||||
%%DATADIR%%/skin/face_images/big_33.gif
|
||||
%%DATADIR%%/skin/face_images/big_34.gif
|
||||
%%DATADIR%%/skin/face_images/big_35.gif
|
||||
%%DATADIR%%/skin/face_images/big_36.gif
|
||||
%%DATADIR%%/skin/face_images/big_37.gif
|
||||
%%DATADIR%%/skin/face_images/big_38.gif
|
||||
%%DATADIR%%/skin/face_images/big_39.gif
|
||||
%%DATADIR%%/skin/face_images/big_4.gif
|
||||
%%DATADIR%%/skin/face_images/big_40.gif
|
||||
%%DATADIR%%/skin/face_images/big_41.gif
|
||||
%%DATADIR%%/skin/face_images/big_42.gif
|
||||
%%DATADIR%%/skin/face_images/big_43.gif
|
||||
%%DATADIR%%/skin/face_images/big_44.gif
|
||||
%%DATADIR%%/skin/face_images/big_45.gif
|
||||
%%DATADIR%%/skin/face_images/big_46.gif
|
||||
%%DATADIR%%/skin/face_images/big_47.gif
|
||||
%%DATADIR%%/skin/face_images/big_48.gif
|
||||
%%DATADIR%%/skin/face_images/big_49.gif
|
||||
%%DATADIR%%/skin/face_images/big_5.gif
|
||||
%%DATADIR%%/skin/face_images/big_50.gif
|
||||
%%DATADIR%%/skin/face_images/big_51.gif
|
||||
%%DATADIR%%/skin/face_images/big_52.gif
|
||||
%%DATADIR%%/skin/face_images/big_6.gif
|
||||
%%DATADIR%%/skin/face_images/big_7.gif
|
||||
%%DATADIR%%/skin/face_images/big_8.gif
|
||||
%%DATADIR%%/skin/face_images/big_9.gif
|
||||
%%DATADIR%%/skin/fetion.svg
|
||||
%%DATADIR%%/skin/find.png
|
||||
%%DATADIR%%/skin/groupsend.png
|
||||
%%DATADIR%%/skin/hilight.png
|
||||
%%DATADIR%%/skin/history.png
|
||||
%%DATADIR%%/skin/home.png
|
||||
%%DATADIR%%/skin/invisible.svg
|
||||
%%DATADIR%%/skin/login.png
|
||||
%%DATADIR%%/skin/logining.gif
|
||||
%%DATADIR%%/skin/move.png
|
||||
%%DATADIR%%/skin/myselfsms.png
|
||||
%%DATADIR%%/skin/nudge.png
|
||||
%%DATADIR%%/skin/offline.svg
|
||||
%%DATADIR%%/skin/online.svg
|
||||
%%DATADIR%%/skin/openfetion.png
|
||||
%%DATADIR%%/skin/options.png
|
||||
%%DATADIR%%/skin/pggroup.png
|
||||
%%DATADIR%%/skin/phone.png
|
||||
%%DATADIR%%/skin/portrait.png
|
||||
%%DATADIR%%/skin/profile.png
|
||||
%%DATADIR%%/skin/proxy.png
|
||||
%%DATADIR%%/skin/reconnecting.gif
|
||||
%%DATADIR%%/skin/refresh.png
|
||||
%%DATADIR%%/skin/warning.svg
|
||||
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
|
||||
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
|
||||
@dirrm %%DATADIR%%/skin/face_images
|
||||
@dirrm %%DATADIR%%/skin
|
||||
@dirrm %%DATADIR%%/resource
|
||||
@dirrm %%DATADIR%%
|
||||
@dirrmtry share/applications
|
|
@ -60,7 +60,6 @@
|
|||
SUBDIR += portell
|
||||
SUBDIR += portless
|
||||
SUBDIR += portlint
|
||||
SUBDIR += portmanager
|
||||
SUBDIR += portmaster
|
||||
SUBDIR += portrac
|
||||
SUBDIR += portscout
|
||||
|
|
|
@ -1,63 +0,0 @@
|
|||
# New ports collection makefile for: portmanager
|
||||
# Date created: April 23, 2004
|
||||
# Whom: Michael C. Shultz <reso3w83@verizon.net>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= portmanager
|
||||
PORTVERSION= 0.4.1
|
||||
PORTREVISION= 9
|
||||
CATEGORIES= ports-mgmt
|
||||
MASTER_SITES= SF
|
||||
|
||||
MAINTAINER= jsa@FreeBSD.org
|
||||
COMMENT= FreeBSD installed ports status and safe update utility
|
||||
|
||||
DEPRECATED= Does not support modern ports features such as MOVED, is lacking upstream and active contributions, and does not support pkgng. \
|
||||
Consider using ports-mgmt/portmaster, ports-mgmt/portupgrade or pkgng.
|
||||
EXPIRATION_DATE=2013-01-04
|
||||
|
||||
MAN1= portmanager.1
|
||||
MAN3= libMG.3 MGdbAdd.3 MGdbCreate.3 MGdbDelete.3 \
|
||||
MGdbGetRecordQty.3 MGdbGoTop.3 MGdbSeek.3
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LDCONFIG= yes
|
||||
INSTALL_TARGET= install info
|
||||
|
||||
#
|
||||
# if --with-bin=something then withvar=${PREFIX} + something
|
||||
# else defaults to withvar=${PREFIX} + /bin
|
||||
#
|
||||
# so --with-bindir=/bin will become ${PREFIX}/bin at configure
|
||||
# time.
|
||||
#
|
||||
CONFIGURE_ARGS= --with-prefix=${PREFIX} --with-bindir=/bin \
|
||||
--with-etcdir=/etc --with-pkgdbdir=/var/db/pkg \
|
||||
--with-portsdir=${PORTSDIR} --with-sharedir=/share/portmanager \
|
||||
--with-tempdir=/tmp
|
||||
|
||||
OPTIONS= DEBUG "Enable debug support and warnings" off \
|
||||
BUILD_DEPENDS_ARE_LEAVES "Treat build dependencies as leaves" off
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
CONFIGURE_ARGS+= --with-debug=yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_BUILD_DEPENDS_ARE_LEAVES)
|
||||
CONFIGURE_ARGS+= --with-treatBuildDependsAsLeaves=yes
|
||||
.endif
|
||||
|
||||
# Keep this in post-configure. After run configure, this value is changed.
|
||||
post-configure:
|
||||
@${REINPLACE_CMD} -e \
|
||||
's|PACKAGE_VERSION "${PORTVERSION}"|PACKAGE_VERSION "${PORTVERSION}_${PORTREVISION}"|g' \
|
||||
${WRKSRC}/externVars.h
|
||||
|
||||
post-install:
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
|
||||
.include <bsd.port.post.mk>
|
|
@ -1,2 +0,0 @@
|
|||
SHA256 (portmanager-0.4.1.tar.gz) = 7b387b5338575c4f328881f9b2d21ee4b36797b888b1c0ebdfe8697527ee7c37
|
||||
SIZE (portmanager-0.4.1.tar.gz) = 492297
|
|
@ -1,11 +0,0 @@
|
|||
--- libMGPM/src/MGPMrController.c.orig Mon Feb 5 12:46:30 2007
|
||||
+++ libMGPM/src/MGPMrController.c Mon Feb 5 12:47:49 2007
|
||||
@@ -270,7 +270,7 @@
|
||||
fprintf( stdout, "%s\n", "running in WITH_BUILD_DEPENDS_ARE_LEAVES mode" );
|
||||
fprintf( stdout, "%s\n", "using this mode is not endorsed by author, if ports" );
|
||||
fprintf( stdout, "%s\n", "fail building due to missing build dependencies" );
|
||||
- fprintf( stdout, "%s\n", "in sysutils/portmanager run \"make config\" and shut this mode off" );
|
||||
+ fprintf( stdout, "%s\n", "in ports-mgmt/portmanager run \"make config\" and shut this mode off" );
|
||||
fprintf( stdout, "%s\n", "then rebuild/reinstall portmanager before contacting author/maintainer" );
|
||||
fprintf( stdout, "%s\n", DOUBLE_LINES );
|
||||
while( fflush( stdout ) );
|
|
@ -1,12 +0,0 @@
|
|||
--- ./libMGPM/src/MGPMrGetPortName.c.orig Wed Dec 14 10:27:41 2005
|
||||
+++ ./libMGPM/src/MGPMrGetPortName.c Fri Dec 8 17:13:00 2006
|
||||
@@ -180,7 +180,8 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- fclose( property->STDIN );
|
||||
+ if( property->autoMoved == 0 )
|
||||
+ fclose( property->STDIN );
|
||||
MGPMlogAdd( property, "installed ", portName,
|
||||
" removed from system: no longer in ports tree: see /usr/ports/MOVED", " ", " " );
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
--- ./libMGPM/src/MGPMrInitialize.c.orig Mon Dec 12 15:32:34 2005
|
||||
+++ ./libMGPM/src/MGPMrInitialize.c Fri Dec 8 17:13:00 2006
|
||||
@@ -47,7 +47,7 @@
|
||||
*/
|
||||
property->configConfFileName = calloc( stringSize + 1, 1 );
|
||||
MGmStrcpy(property->configConfFileName, ETCDIR);
|
||||
- MGmStrcat(property->configConfFileName, "/portmanager/" );
|
||||
+ MGmStrcat(property->configConfFileName, "/portmanager" );
|
||||
MGmStrcat(property->configConfFileName, CONFIGURE_CONF);
|
||||
|
||||
/*
|
|
@ -1,11 +0,0 @@
|
|||
--- ./libMGPM/src/MGPMrPortBrokeCheck.c.orig Tue Dec 13 17:08:27 2005
|
||||
+++ ./libMGPM/src/MGPMrPortBrokeCheck.c Fri Dec 8 17:13:00 2006
|
||||
@@ -78,7 +78,7 @@
|
||||
}
|
||||
buffer[0] = 0;
|
||||
fread( buffer, MAXBUFFERSIZE, 1, pHandle );
|
||||
- if( ferror( pHandle ) == 0 && MGrStrlen( buffer ) > 1 )
|
||||
+ if( ferror( pHandle ) == 0 && MGrBufferlen( buffer, MAXBUFFERSIZE ) > 1 )
|
||||
{
|
||||
fprintf( stdout, "%s %s error: %s %s marked %s, adding to ignore.db\n", id, PACKAGE_VERSION, oldPortName, oldPortDir, brokeCheckType );
|
||||
while( fflush( stdout ) );
|
|
@ -1,11 +0,0 @@
|
|||
--- ./libMGPM/src/MGPMrReadConfigure.c.orig Wed Dec 14 00:12:40 2005
|
||||
+++ ./libMGPM/src/MGPMrReadConfigure.c Fri Dec 8 17:13:00 2006
|
||||
@@ -156,7 +156,7 @@
|
||||
|
||||
MGmStrcpy( cmd[0], "/bin/cp" );
|
||||
MGmStrcpy( cmd[1], property->configConfFileName );
|
||||
- MGmStrcat( cmd[1], ".SAMPLE " );
|
||||
+ MGmStrcat( cmd[1], ".SAMPLE" );
|
||||
MGmStrcpy( cmd[2], property->configConfFileName );
|
||||
|
||||
MGmSystem( cmd, NULL );
|
|
@ -1,260 +0,0 @@
|
|||
--- ./libMGPM/src/MGPMrShowLeavesDelete.c.orig Mon Dec 12 15:32:34 2005
|
||||
+++ ./libMGPM/src/MGPMrShowLeavesDelete.c Fri Dec 8 17:13:00 2006
|
||||
@@ -28,7 +28,6 @@
|
||||
*/
|
||||
|
||||
#include <libMGPM.h>
|
||||
-#include <sgtty.h>
|
||||
|
||||
int nuke( char* leafPortDir );
|
||||
int rebuildDb( structProperty* property );
|
||||
@@ -39,19 +39,21 @@
|
||||
char exact[] = "exact";
|
||||
char id[] = "MGPMrShowLeavesDelete";
|
||||
char* command = NULL;
|
||||
- char* leafPortDir = NULL;
|
||||
+ char* leafPortDir;
|
||||
char* leafPortName = NULL;
|
||||
char* pkgDescFile = NULL;
|
||||
+ char** cmd;
|
||||
+ char** env;
|
||||
int answer = 1;
|
||||
- int bufferSize = 0xffff;
|
||||
int doubleBreak = 0;
|
||||
int installedPortsDbIDX = 0;
|
||||
int installedPortsDbQTY = 0;
|
||||
|
||||
- command = calloc( bufferSize, 1 );
|
||||
- leafPortDir = calloc( bufferSize, 1 );
|
||||
- leafPortName = calloc( bufferSize, 1 );
|
||||
- pkgDescFile = calloc( bufferSize, 1 );
|
||||
+ leafPortDir = calloc( MAXSTRINGSIZE, 1 );
|
||||
+ leafPortName = calloc( MAXSTRINGSIZE, 1 );
|
||||
+
|
||||
+ command = calloc( MAXBUFFERSIZE, 1 );
|
||||
+ pkgDescFile = calloc( MAXBUFFERSIZE, 1 );
|
||||
|
||||
if( ( property->ignoreDb = MGdbOpen( property->ignoreDbFileName ) ) == NULL )
|
||||
{
|
||||
@@ -108,50 +110,94 @@
|
||||
installedPortsDbIDX++;
|
||||
continue;
|
||||
}
|
||||
-/*
|
||||
- if( answer != KEY_ENTER )
|
||||
+
|
||||
+ cmd = malloc( sizeof( char* ) * 2 );
|
||||
+ cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[1] = 0;
|
||||
+
|
||||
+ env = malloc( sizeof( char* ) * 2 );
|
||||
+ env[0] = malloc( MAXSTRINGSIZE );
|
||||
+ env[1] = 0;
|
||||
+
|
||||
+ MGmStrcpy( env[0], "TERM=" );
|
||||
+ MGmStrcat( env[0], getenv( "TERM" ) );
|
||||
+
|
||||
+ MGmStrcpy( cmd[0], "/usr/bin/clear" );
|
||||
+
|
||||
+ MGmSystem( cmd, env );
|
||||
+
|
||||
+ free( env[0] );
|
||||
+ free( env );
|
||||
+
|
||||
+ free( cmd[0] );
|
||||
+ free( cmd );
|
||||
+
|
||||
+ fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
+ fprintf( stdout, "*** for safety run portmanager -u after using this feature for deletion ***\n" );
|
||||
+ fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
+ fprintf( stdout, "Ports with no ports depending on them AKA \"leaf ports.\"\n" );
|
||||
+ fprintf( stdout, "These ports may be deinstalled because no other ports rely on them to run;\"\n" );
|
||||
+ if( property->buildDependsAreLeaves )
|
||||
{
|
||||
-*/
|
||||
- system( "clear" );
|
||||
- fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
- fprintf( stdout, "*** for safety run portmanager -u after using this feature for deletion ***\n" );
|
||||
- fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
- fprintf( stdout, "Ports with no ports depending on them AKA \"leaf ports.\"\n" );
|
||||
- fprintf( stdout, "These ports may be deinstalled because no other ports rely on them to run;\"\n" );
|
||||
- if( property->buildDependsAreLeaves )
|
||||
- {
|
||||
- fprintf( stdout, "however, other ports may rely on these to build.\"\n" );
|
||||
- }
|
||||
- fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
+ fprintf( stdout, "however, other ports may rely on these to build.\"\n" );
|
||||
+ }
|
||||
+ fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
|
||||
- fprintf( stdout, "%s dir -=> %s\n\n", leafPortName, leafPortDir );
|
||||
- while( fflush( stdout ) );
|
||||
+ fprintf( stdout, "%s dir -=> %s\n\n", leafPortName, leafPortDir );
|
||||
+ while( fflush( stdout ) );
|
||||
|
||||
- MGmStrcpy( pkgDescFile, PORTSDIR );
|
||||
- MGmStrcat( pkgDescFile, leafPortDir );
|
||||
- MGmStrcat( pkgDescFile, "/pkg-descr" );
|
||||
+ MGmStrcpy( pkgDescFile, PORTSDIR );
|
||||
+ MGmStrcat( pkgDescFile, leafPortDir );
|
||||
+ MGmStrcat( pkgDescFile, "/pkg-descr" );
|
||||
|
||||
- if( MGrIfFileExist( pkgDescFile ) )
|
||||
- {
|
||||
- MGmStrcpy( command, "cat " );
|
||||
- MGmStrcat( command, pkgDescFile );
|
||||
- system( command );
|
||||
- fprintf( stdout, "\n" );
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- MGmStrcpy( command, "grep COMMENT " );
|
||||
- MGmStrcat( command, PORTSDIR );
|
||||
- MGmStrcat( command, leafPortDir );
|
||||
- MGmStrcat( command, "/Makefile" );
|
||||
- system( command );
|
||||
- }
|
||||
- fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
- fprintf( stdout, "\n<ENTER> to skip\n<X><ENTER> removes port\n<N><ENTER> *Nuke it*, removes distribution files\n\n" );
|
||||
- fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
-/*
|
||||
+ if( MGrIfFileExist( pkgDescFile ) )
|
||||
+ {
|
||||
+ cmd = malloc( sizeof( char* ) * 3 );
|
||||
+ cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[1] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[2] = 0;
|
||||
+
|
||||
+ MGmStrcpy( cmd[0], "/bin/cat" );
|
||||
+ MGmStrcpy( cmd[1], pkgDescFile );
|
||||
+
|
||||
+ MGmSystem( cmd, NULL );
|
||||
+
|
||||
+ free( cmd[0] );
|
||||
+ free( cmd[1] );
|
||||
+ free( cmd );
|
||||
+
|
||||
+ fprintf( stdout, "\n" );
|
||||
+ while( fflush( stdout ) );
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ cmd = malloc( sizeof( char* ) * 4 );
|
||||
+ cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[1] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[2] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[3] = 0;
|
||||
+
|
||||
+ MGmStrcpy( cmd[0], "/usr/bin/grep" );
|
||||
+ MGmStrcpy( cmd[1], "COMMENT" );
|
||||
+ MGmStrcpy( cmd[2], PORTSDIR );
|
||||
+ MGmStrcat( cmd[2], leafPortDir );
|
||||
+ MGmStrcat( cmd[2], "/Makefile" );
|
||||
+
|
||||
+ MGmSystem( cmd, NULL );
|
||||
+
|
||||
+ free( cmd[0] );
|
||||
+ free( cmd[1] );
|
||||
+ free( cmd[2] );
|
||||
+ free( cmd );
|
||||
+
|
||||
+ fprintf( stdout, "\n" );
|
||||
+ while( fflush( stdout ) );
|
||||
}
|
||||
-*/
|
||||
+ fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
+ fprintf( stdout, "\n<ENTER> to skip\n<X><ENTER> removes port\n<N><ENTER> *Nuke it*, removes distribution files\n\n" );
|
||||
+ fprintf( stdout,"%s\n", SINGLE_LINES );
|
||||
+ while( fflush( stdout ) );
|
||||
+
|
||||
property->STDIN = fopen( "/dev/stdin", "r" ); /* Flawfinder: ignore */
|
||||
doubleBreak = 0;
|
||||
while( 1 == 1 )
|
||||
@@ -243,9 +289,7 @@
|
||||
{
|
||||
char id[] = "removePort";
|
||||
char exact[] = "exact";
|
||||
- char* command = NULL;
|
||||
-
|
||||
- command = (char*)calloc( 0xffff, 1 );
|
||||
+ char** cmd;
|
||||
|
||||
property->installedPortsDb = MGdbDelete( property->installedPortsDb, installedPortsDbIDX );
|
||||
|
||||
@@ -261,12 +305,26 @@
|
||||
MGdbGoTop( property->availableDependenciesDb );
|
||||
}
|
||||
|
||||
- MGmStrcpy( command, "pkg_delete -f " );
|
||||
- MGmStrcat( command, leafPortNamePtr );
|
||||
- fprintf( stdout, "\nexecuting: %s\n", command );
|
||||
+ cmd = malloc( sizeof( char* ) * 4 );
|
||||
+ cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[1] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[2] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[3] = 0;
|
||||
+
|
||||
+ MGmStrcpy( cmd[0], "/usr/sbin/pkg_delete" );
|
||||
+ MGmStrcpy( cmd[1], "-f" );
|
||||
+ MGmStrcpy( cmd[2], leafPortNamePtr );
|
||||
+
|
||||
+ fprintf( stdout, "\nexecuting: %s %s %s\n", cmd[0], cmd[1], cmd[2] );
|
||||
while( fflush( stdout ) );
|
||||
- system( command );
|
||||
- free(command);
|
||||
+
|
||||
+ MGmSystem( cmd, NULL );
|
||||
+
|
||||
+ free( cmd[2] );
|
||||
+ free( cmd[1] );
|
||||
+ free( cmd[0] );
|
||||
+ free( cmd );
|
||||
+
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
@@ -274,18 +332,35 @@
|
||||
int nuke( char* leafPortDir )
|
||||
{
|
||||
char id[] = "nuke";
|
||||
- char* command = NULL;
|
||||
+ char** cmd;
|
||||
|
||||
- command = (char*)calloc( 0xffff, 1 );
|
||||
+ cmd = malloc( sizeof( char* ) * 4 );
|
||||
+ cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[1] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[2] = 0;
|
||||
+
|
||||
+ MGmStrcpy( cmd[0], PORTSDIR );
|
||||
+ MGmStrcat( cmd[0], leafPortDir );
|
||||
+ if( chdir( cmd[0] ) != 0 )
|
||||
+ {
|
||||
+ fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] );
|
||||
+ perror( "chroot" );
|
||||
+ while( fflush( stderr ) );
|
||||
+ assert( 0 );
|
||||
+ }
|
||||
|
||||
- MGmStrcpy( command, "cd " );
|
||||
- MGmStrcat( command, PORTSDIR );
|
||||
- MGmStrcat( command, leafPortDir );
|
||||
- MGmStrcat( command, "; make distclean" );
|
||||
- fprintf( stdout, "\nexecuting: %s\n", command );
|
||||
+ MGmStrcpy( cmd[0], "/usr/bin/make" );
|
||||
+ MGmStrcpy( cmd[1], "distclean" );
|
||||
+
|
||||
+ fprintf( stdout, "\nexecuting: %s %s\n", cmd[0], cmd[1] );
|
||||
while( fflush( stdout ) );
|
||||
- system( command );
|
||||
- free(command);
|
||||
+
|
||||
+ MGmSystem( cmd, NULL );
|
||||
+
|
||||
+ free( cmd[1] );
|
||||
+ free( cmd[0] );
|
||||
+ free( cmd );
|
||||
+
|
||||
return( 0 );
|
||||
}
|
||||
|
|
@ -1,427 +0,0 @@
|
|||
--- libMGPM/src/MGPMrUpdate.c.orig Wed Dec 14 13:23:59 2005
|
||||
+++ libMGPM/src/MGPMrUpdate.c Mon Feb 5 12:50:13 2007
|
||||
@@ -60,6 +60,7 @@
|
||||
char* stopPortDirPtr = NULL;
|
||||
char* strikePtr = NULL;
|
||||
char** cmd;
|
||||
+ char** env;
|
||||
int answer = 1;
|
||||
int availableDependenciesDbIDX = 0;
|
||||
int availableDependenciesDbQTY = 0;
|
||||
@@ -74,12 +75,6 @@
|
||||
|
||||
property->optionsChanged = 0;
|
||||
|
||||
- localProperty.environment = malloc( sizeof( char** ) * 4 );
|
||||
- localProperty.environment[0] = malloc( MAXSTRINGSIZE );
|
||||
- localProperty.environment[1] = malloc( MAXSTRINGSIZE );
|
||||
- localProperty.environment[2] = malloc( MAXSTRINGSIZE );
|
||||
- localProperty.environment[3] = 0;
|
||||
-
|
||||
localProperty.CURDIR = calloc( MAXSTRINGSIZE, 1 );
|
||||
localProperty.afterOptionsFileSize = calloc( MAXSTRINGSIZE, 1 );
|
||||
localProperty.afterOptionsFileTime = calloc( MAXSTRINGSIZE, 1 );
|
||||
@@ -110,7 +105,7 @@
|
||||
property->installedPortsDb = MGdbOpen( property->installedPortsDbFileName );
|
||||
property->strikesDb = MGdbOpen( property->strikesDbFileName );
|
||||
|
||||
- if( ( strcmp( "/sysutils/portmanager", oldPortDir ) == 0 || strcmp( "/local/sysutils/portmanager", oldPortDir ) == 0 ) && property->forced )
|
||||
+ if( ( strcmp( "/ports-mgmt/portmanager", oldPortDir ) == 0 || strcmp( "/local/ports-mgmt/portmanager", oldPortDir ) == 0 ) && property->forced )
|
||||
{
|
||||
fprintf( stdout, "ignoring portmanager, will not self update in forced mode by design\n" );
|
||||
while( fflush( stdout ) );
|
||||
@@ -122,30 +117,6 @@
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
- /*
|
||||
- * setup environment
|
||||
- */
|
||||
- MGmStrcpy( localProperty.environment[0], "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/X11R6/bin" );
|
||||
-
|
||||
- if( getenv( "CCACHE_DIR" ) != NULL )
|
||||
- {
|
||||
- MGmStrcpy( localProperty.environment[1], "CCACHE_DIR=" );
|
||||
- MGmStrcat( localProperty.environment[1], getenv( "CCACHE_DIR" ) );
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- localProperty.environment[1][0] = 0;
|
||||
- }
|
||||
-
|
||||
- if( getenv( "CCACHE_PATH" ) != NULL )
|
||||
- {
|
||||
- MGmStrcpy( localProperty.environment[2], "CCACHE_PATH=/usr/bin:/usr/local/bin" );
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- localProperty.environment[2][0] = 0;
|
||||
- }
|
||||
-
|
||||
/*
|
||||
* test for bsd.ports.mk patch
|
||||
*/
|
||||
@@ -466,25 +437,53 @@
|
||||
*/
|
||||
/*
|
||||
* If here we know OPTIONS is defined, need to run make config
|
||||
- * if /var/db/ports/{package name}/options exists
|
||||
+ * if /var/db/ports/{package name}/options does not exist
|
||||
*/
|
||||
if( MGrIfFileExist( localProperty.optionsDir ) == 0 )
|
||||
{
|
||||
- MGmStrcpy( localProperty.command, "cd " );
|
||||
- MGmStrcat( localProperty.command, PORTSDIR );
|
||||
- MGmStrcat( localProperty.command, oldPortDir );
|
||||
- MGmStrcat( localProperty.command, " && make config " );
|
||||
- if( MGrStrlen( localProperty.options ) > 0 )
|
||||
+ cmd = malloc( sizeof( char* ) * 3 );
|
||||
+ cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[1] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[2] = 0;
|
||||
+
|
||||
+ env = malloc( sizeof( char* ) * 2 );
|
||||
+ env[0] = malloc( MAXSTRINGSIZE );
|
||||
+ env[1] = 0;
|
||||
+
|
||||
+ MGmStrcpy( env[0], "TERM=" );
|
||||
+ MGmStrcat( env[0], getenv( "TERM" ) );
|
||||
+
|
||||
+ MGmStrcpy( cmd[0], PORTSDIR );
|
||||
+ MGmStrcat( cmd[0], oldPortDir );
|
||||
+
|
||||
+ fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
+ fprintf( stdout, "config %s \n", cmd[0] );
|
||||
+ while( fflush( stdout ) );
|
||||
+
|
||||
+ if( chdir( cmd[0] ) != 0 )
|
||||
{
|
||||
- MGmStrcat( localProperty.command, localProperty.options );
|
||||
+ fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] );
|
||||
+ perror( "chroot" );
|
||||
+ while( fflush( stderr ) );
|
||||
+ assert( 0 );
|
||||
}
|
||||
|
||||
- fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
- fprintf( stdout, "update %s \n", oldPortName );
|
||||
- fprintf( stdout, "%s %s command: #2 of 14 %s\n", id, PACKAGE_VERSION, localProperty.command );
|
||||
- fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
+ MGmStrcpy( cmd[0], "/usr/bin/make" );
|
||||
+ MGmStrcpy( cmd[1], "config" );
|
||||
+ fprintf( stdout, "%s %s command: #2 of 14 %s %s\n", id, PACKAGE_VERSION, cmd[0], cmd[1] );
|
||||
while( fflush( stdout ) );
|
||||
- system(localProperty.command);
|
||||
+
|
||||
+ MGmSystem( cmd, env );
|
||||
+
|
||||
+ free( env[0] );
|
||||
+ free( env );
|
||||
+
|
||||
+ free( cmd[1] );
|
||||
+ free( cmd[0] );
|
||||
+ free( cmd );
|
||||
+
|
||||
+ fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
+
|
||||
}
|
||||
MGmStrcpy( localProperty.afterOptionsFileTime,
|
||||
MGrIntToString( (int)MGrFileTime( localProperty.optionsDir ) ) );
|
||||
@@ -567,17 +566,8 @@
|
||||
MGmStrcpy( strike, strikePtr );
|
||||
if( strike[0] == '2' )
|
||||
{
|
||||
+ MGPMlogAdd( property, oldPortName, oldPortDir, "make Strike 3, marking port as ignore/looping ", " ", " " );
|
||||
MGdbAdd( property->ignoreDb, oldPortDir, "looping, 3rd attempt at make", NULL );
|
||||
- if( property->log )
|
||||
- {
|
||||
- MGmStrcpy( localProperty.command, "echo \"make Strike 3 " );
|
||||
- MGmStrcat( localProperty.command, oldPortName );
|
||||
- MGmStrcat( localProperty.command, " " );
|
||||
- MGmStrcat( localProperty.command, oldPortDir );
|
||||
- MGmStrcat( localProperty.command, " marking port as ignore/looping " );
|
||||
- MGmStrcat( localProperty.command, " \">> /var/log/portmanager.log" );
|
||||
- system( localProperty.command );
|
||||
- }
|
||||
rCleanUp( property, &localProperty );
|
||||
return( 0 );
|
||||
}
|
||||
@@ -593,16 +583,8 @@
|
||||
property->fieldStrikesIDX,
|
||||
exact );
|
||||
property->strikesDb = MGdbDelete( property->strikesDb, MGdbGetRecno( property->strikesDb ) - 1 );
|
||||
+ MGPMlogAdd( property, oldPortName, oldPortDir, "make Strike 2", " ", " " );
|
||||
MGdbAdd( property->strikesDb, oldPortDir, "2", NULL );
|
||||
- if( property->log )
|
||||
- {
|
||||
- MGmStrcpy( localProperty.command, "echo \"make Strike 2 " );
|
||||
- MGmStrcat( localProperty.command, oldPortName );
|
||||
- MGmStrcat( localProperty.command, " " );
|
||||
- MGmStrcat( localProperty.command, oldPortDir );
|
||||
- MGmStrcat( localProperty.command, " \">> /var/log/portmanager.log" );
|
||||
- system( localProperty.command );
|
||||
- }
|
||||
/*
|
||||
* dualOriginCheck( property, oldPortName ); used to be here in old portmanager ver < 0.3.1, seems to be no longer
|
||||
* needed, keep this note just in case
|
||||
@@ -797,20 +779,28 @@
|
||||
MGPMlogAdd( property, "conflicting installed ", localProperty.installedPortName,
|
||||
" removed from system: conflicted with ", oldPortName, " " );
|
||||
}
|
||||
+ cmd = malloc( sizeof( char* ) * 4 );
|
||||
+ cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[1] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[2] = malloc( MAXSTRINGSIZE );
|
||||
+ cmd[3] = 0;
|
||||
+
|
||||
+ MGmStrcpy( cmd[0], "/usr/sbin/pkg_delete" );
|
||||
+ MGmStrcpy( cmd[1], "-f" );
|
||||
+ MGmStrcpy( cmd[2], localProperty.installedPortName );
|
||||
|
||||
- MGmStrcpy( localProperty.command, "pkg_delete -f " );
|
||||
- MGmStrcat( localProperty.command, localProperty.installedPortName );
|
||||
- fprintf( stdout, "executing: %s\n", localProperty.command );
|
||||
+ fprintf( stdout, "\nexecuting: %s %s %s\n", cmd[0], cmd[1], cmd[2] );
|
||||
while( fflush( stdout ) );
|
||||
- errorCode = system( localProperty.command );
|
||||
- if( property->log )
|
||||
- {
|
||||
- MGmStrcpy( localProperty.command, "echo \"removed conflicting port " );
|
||||
- MGmStrcat( localProperty.command, localProperty.installedPortName );
|
||||
- MGmStrcat( localProperty.command, " " );
|
||||
- MGmStrcat( localProperty.command, " \">> /var/log/portmanager.log" );
|
||||
- system( localProperty.command );
|
||||
- }
|
||||
+
|
||||
+ MGmSystem( cmd, NULL );
|
||||
+
|
||||
+ free( cmd[2] );
|
||||
+ free( cmd[1] );
|
||||
+ free( cmd[0] );
|
||||
+ free( cmd );
|
||||
+
|
||||
+ MGPMlogAdd( property, "removed conflicting port", localProperty.installedPortName,
|
||||
+ " ", " ", " " );
|
||||
}
|
||||
installedPortsDbIDX++;
|
||||
}
|
||||
@@ -848,15 +838,7 @@
|
||||
fprintf( stderr, "marking %s as ignored\n", oldPortName );
|
||||
fprintf( stdout, "%s\n", DOUBLE_LINES );
|
||||
while( fflush( stderr ) );
|
||||
- if( property->log )
|
||||
- {
|
||||
- MGmStrcpy( localProperty.command, "echo \" " );
|
||||
- MGmStrcat( localProperty.command, oldPortName );
|
||||
- MGmStrcat( localProperty.command, " " );
|
||||
- MGmStrcat( localProperty.command, oldPortDir );
|
||||
- MGmStrcat( localProperty.command, " conflicts with another installed port so marked ignore\" >> /var/log/portmanager.log" );
|
||||
- system( localProperty.command );
|
||||
- }
|
||||
+ MGPMlogAdd( property, oldPortName, oldPortDir, "conflicts with another installed port so marked ignore", " ", " " );
|
||||
MGdbAdd( property->ignoreDb, oldPortDir, "conflicts with another installed port", NULL );
|
||||
rCleanUp( property, &localProperty );
|
||||
return( 0 );
|
||||
@@ -986,15 +968,7 @@
|
||||
while( fflush( stdout ) );
|
||||
if( ( errorCode = system(localProperty.command) ) )
|
||||
{
|
||||
- if( property->log )
|
||||
- {
|
||||
- MGmStrcpy( localProperty.command, "echo \" " );
|
||||
- MGmStrcat( localProperty.command, oldPortName );
|
||||
- MGmStrcat( localProperty.command, " " );
|
||||
- MGmStrcat( localProperty.command, oldPortDir );
|
||||
- MGmStrcat( localProperty.command, " failed to fetch\" >> /var/log/portmanager.log" );
|
||||
- system( localProperty.command );
|
||||
- }
|
||||
+ MGPMlogAdd( property, oldPortName, oldPortDir, "failed to fetch, adding to ignore.db", " ", " " );
|
||||
fprintf( stdout, "%s %s error: make fetch returned an error, adding %s to ignore.db\n", id, PACKAGE_VERSION, oldPortDir );
|
||||
while( fflush( stdout ) );
|
||||
MGdbAdd( property->ignoreDb, oldPortDir, "failed during make fetch", NULL );
|
||||
@@ -1005,70 +979,29 @@
|
||||
/************************************************************************/
|
||||
/* Command "9" " make" */
|
||||
/************************************************************************/
|
||||
+ MGmStrcpy( localProperty.command, "cd " );
|
||||
+ MGmStrcat( localProperty.command, PORTSDIR );
|
||||
+ MGmStrcat( localProperty.command, oldPortDir );
|
||||
+ MGmStrcat( localProperty.command, " && make " );
|
||||
if( MGrStrlen( localProperty.options ) > 0 )
|
||||
{
|
||||
- cmd = malloc( sizeof( char** ) * 3 );
|
||||
- cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
- cmd[1] = malloc( MAXBUFFERSIZE );
|
||||
- cmd[2] = 0;
|
||||
- MGmStrcpy( cmd[0], PORTSDIR );
|
||||
- MGmStrcat( cmd[0], oldPortDir );
|
||||
- if( chdir( cmd[0] ) != 0 )
|
||||
- {
|
||||
- fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] );
|
||||
- perror( "chroot" );
|
||||
- while( fflush( stderr ) );
|
||||
- assert( 0 );
|
||||
- }
|
||||
- MGmStrcpy( cmd[0], "/usr/bin/make" );
|
||||
- MGmBuffercpy( cmd[1], localProperty.options, MAXBUFFERSIZE );
|
||||
- fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
- fprintf( stdout, "update %s \n", oldPortName );
|
||||
- fprintf( stdout, "%s %s command: #9 of 14 %s\nOPTIONS-=>%s\n", id, PACKAGE_VERSION, cmd[0], cmd[1] );
|
||||
- fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
- while( fflush( stdout ) );
|
||||
- MGmSystem( cmd, localProperty.environment );
|
||||
- free( cmd[0] );
|
||||
- free( cmd[1] );
|
||||
- free( cmd );
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- cmd = malloc( sizeof( char** ) * 2 );
|
||||
- cmd[0] = malloc( MAXSTRINGSIZE );
|
||||
- cmd[1] = 0;
|
||||
- MGmStrcpy( cmd[0], PORTSDIR );
|
||||
- MGmStrcat( cmd[0], oldPortDir );
|
||||
- if( chdir( cmd[0] ) != 0 )
|
||||
- {
|
||||
- fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] );
|
||||
- perror( "chroot" );
|
||||
- while( fflush( stderr ) );
|
||||
- assert( 0 );
|
||||
- }
|
||||
- MGmStrcpy( cmd[0], "/usr/bin/make" );
|
||||
- fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
- fprintf( stdout, "update %s \n", oldPortName );
|
||||
- fprintf( stdout, "%s %s command: #9 of 14 %s\n", id, PACKAGE_VERSION, cmd[0] );
|
||||
- fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
- while( fflush( stdout ) );
|
||||
- MGmSystem( cmd, localProperty.environment );
|
||||
- free( cmd[0] );
|
||||
- free( cmd );
|
||||
+ MGmStrcat( localProperty.command, localProperty.options );
|
||||
}
|
||||
|
||||
- if( MGrIfDirEntry( localProperty.workFullPath, ".build_done" ) == 0 )
|
||||
+ fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
+ fprintf( stdout, "update %s \n", oldPortName );
|
||||
+ fprintf( stdout, "%s %s command: #9 of 14 %s\n", id, PACKAGE_VERSION, localProperty.command );
|
||||
+ fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
+ while( fflush( stdout ) );
|
||||
+ if( ( errorCode = system(localProperty.command) ) )
|
||||
{
|
||||
- fprintf( stderr, "%s\n", SINGLE_LINES );
|
||||
- fprintf( stderr, "%s error: %s %s failed during make, adding to ignore.db\n", id, oldPortName, oldPortDir );
|
||||
- fprintf( stderr, "%s\n", SINGLE_LINES );
|
||||
- while( fflush( stderr ) );
|
||||
- MGPMlogAdd( property, oldPortName, oldPortDir, "port failed to build during make, adding to ignore.db", " ", " " );
|
||||
- MGdbAdd( property->ignoreDb, oldPortDir, "port failed to build during make\n", NULL );
|
||||
+ MGPMlogAdd( property, oldPortName, oldPortDir, "failed during make, adding to ignore.db", " ", " " );
|
||||
+ fprintf( stdout, "%s %s error: make returned an error, adding %s to ignore.db\n", id, PACKAGE_VERSION, oldPortDir );
|
||||
+ while( fflush( stdout ) );
|
||||
+ MGdbAdd( property->ignoreDb, oldPortDir, "failed during make", NULL );
|
||||
rCleanUp( property, &localProperty );
|
||||
return(0);
|
||||
}
|
||||
-
|
||||
/************************************************************************/
|
||||
/* Command "10" pkg_create -b */
|
||||
/************************************************************************/
|
||||
@@ -1113,12 +1046,12 @@
|
||||
/*
|
||||
* inforced mass update mode portmanager CANNOT loose its databases
|
||||
*/
|
||||
- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
|
||||
+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
|
||||
property->pmMode == SINGLE )
|
||||
{
|
||||
MGmStrcpy( localProperty.command, "cd " );
|
||||
MGmStrcat( localProperty.command, PORTSDIR );
|
||||
- MGmStrcat( localProperty.command, "/sysutils/portmanager; " );
|
||||
+ MGmStrcat( localProperty.command, "/ports-mgmt/portmanager; " );
|
||||
MGmStrcat( localProperty.command, "make -V PKG_DBDIR" );
|
||||
pHandle = popen( localProperty.command, "r" );
|
||||
localProperty.buffer[0] = 0;
|
||||
@@ -1146,7 +1079,7 @@
|
||||
/*
|
||||
* have to do this here before db's are wacked
|
||||
*/
|
||||
- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
|
||||
+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
|
||||
property->pmMode == MULTI )
|
||||
{
|
||||
/*
|
||||
@@ -1266,7 +1199,7 @@
|
||||
MGmStrcat(localProperty.command, TEMPDIR);
|
||||
MGmStrcat(localProperty.command, "/");
|
||||
MGmStrcat(localProperty.command, oldPortName);
|
||||
- MGmStrcat(localProperty.command, ".tgz");
|
||||
+ MGmStrcat(localProperty.command, ".t[bg]z");
|
||||
fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
fprintf( stderr, "restoring original port from backup \n" );
|
||||
fprintf( stderr, "%s %s command: #12 of 14!! ***Emergancy restore*** %s\n", id, PACKAGE_VERSION, localProperty.command );
|
||||
@@ -1330,7 +1263,7 @@
|
||||
MGmStrcat( localProperty.command, TEMPDIR);
|
||||
MGmStrcat( localProperty.command, "; rm -f ");
|
||||
MGmStrcat( localProperty.command, oldPortName);
|
||||
- MGmStrcat( localProperty.command, ".tgz" );
|
||||
+ MGmStrcat( localProperty.command, ".t[bg]z" );
|
||||
fprintf( stdout, "%s\n", SINGLE_LINES );
|
||||
fprintf( stderr, "deleting backup copy, installation of updated %s successful\n", oldPortDir );
|
||||
fprintf( stdout, "%s %s localProperty.command: #12 of 14 %s\n", id, PACKAGE_VERSION, localProperty.command );
|
||||
@@ -1414,7 +1347,7 @@
|
||||
/*
|
||||
* if portmanager updated there won't be any databases, so need to clean the old fashoned way
|
||||
*/
|
||||
- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
|
||||
+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
|
||||
property->pmMode == MULTI )
|
||||
{
|
||||
rCleanDir( oldPortDir, localProperty.workDir );
|
||||
@@ -1460,7 +1393,7 @@
|
||||
/*
|
||||
* portmanager auto restart after updating itself
|
||||
*/
|
||||
- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
|
||||
+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
|
||||
property->pmMode == MULTI )
|
||||
{
|
||||
/*
|
||||
@@ -1556,12 +1489,6 @@
|
||||
MGdbDestroy( property->installedPortsDb );
|
||||
MGdbDestroy( property->strikesDb );
|
||||
|
||||
-
|
||||
- free( localProperty->environment[0] );
|
||||
- free( localProperty->environment[1] );
|
||||
- free( localProperty->environment[2] );
|
||||
- free( localProperty->environment );
|
||||
-
|
||||
free( localProperty->CURDIR );
|
||||
free( localProperty->afterOptionsFileSize );
|
||||
free( localProperty->afterOptionsFileTime );
|
||||
@@ -1655,7 +1582,7 @@
|
||||
*/
|
||||
MGmStrcpy( localProperty->command, "cd " );
|
||||
MGmStrcat( localProperty->command, PORTSDIR );
|
||||
- MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PKGNAME" );
|
||||
+ MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PKGNAME" );
|
||||
pHandle = popen( localProperty->command, "r" );
|
||||
localProperty->buffer[0] = 0;
|
||||
fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
|
||||
@@ -1693,7 +1620,7 @@
|
||||
*/
|
||||
MGmStrcpy( localProperty->command, "cd " );
|
||||
MGmStrcat( localProperty->command, PORTSDIR );
|
||||
- MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PKGNAME" );
|
||||
+ MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PKGNAME" );
|
||||
pHandle = popen( localProperty->command, "r" );
|
||||
localProperty->buffer[0] = 0;
|
||||
fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
|
||||
@@ -1737,7 +1664,7 @@
|
||||
*/
|
||||
MGmStrcpy( localProperty->command, "cd " );
|
||||
MGmStrcat( localProperty->command, PORTSDIR );
|
||||
- MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PORTMANAGER" );
|
||||
+ MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PORTMANAGER" );
|
||||
pHandle = popen( localProperty->command, "r" );
|
||||
localProperty->buffer[0] = 0;
|
||||
fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
|
|
@ -1,10 +0,0 @@
|
|||
--- ./libMGPM/src/libMGPM.h.orig Tue Dec 13 17:23:14 2005
|
||||
+++ ./libMGPM/src/libMGPM.h Fri Dec 8 17:13:00 2006
|
||||
@@ -118,7 +118,6 @@
|
||||
char* workDir;
|
||||
char* workFullPath;
|
||||
char* xtermTitle;
|
||||
- char** environment;
|
||||
int bufferSize;
|
||||
int optionsBufferSize;
|
||||
} structLocalProperty;
|
|
@ -1,30 +0,0 @@
|
|||
--- ./libMG/src/MGdbAdd.c.orig Mon Dec 12 15:32:34 2005
|
||||
+++ ./libMG/src/MGdbAdd.c Fri Dec 8 17:13:00 2006
|
||||
@@ -39,7 +39,9 @@
|
||||
int idx = 0;
|
||||
va_list paramList;
|
||||
|
||||
- /* check if we have a valid object */
|
||||
+ /*
|
||||
+ * check if we have a valid object
|
||||
+ */
|
||||
if( db->parent.type != CLASS_TYPE_DB )
|
||||
{
|
||||
fprintf( stderr, "%s error: invalid object type\n", id);
|
||||
@@ -71,6 +73,8 @@
|
||||
*/
|
||||
if( MGrBufferlen( paramPtr, MAXBUFFERSIZE ) < 1 )
|
||||
{
|
||||
+ fprintf( stderr, "%s error: attempt to place null data into record halted\n", id );
|
||||
+ while( fflush( stderr ) );
|
||||
assert(0);
|
||||
}
|
||||
fprintf( dbFileStream, "%s%c", paramPtr, 0 );
|
||||
@@ -85,6 +89,7 @@
|
||||
{
|
||||
fprintf( stderr, "%s error: fields added (%d) exceed field quantity (%d)\n did you forget to terminate MGdbAdd with a NULL field?\n",
|
||||
id, idx, db->fieldQty );
|
||||
+ while( fflush( stderr ) );
|
||||
assert(0);
|
||||
}
|
||||
}
|
|
@ -1,18 +0,0 @@
|
|||
--- ./libMG/src/MGdbRead.c.orig Mon Dec 12 15:32:34 2005
|
||||
+++ ./libMG/src/MGdbRead.c Fri Dec 8 17:13:00 2006
|
||||
@@ -58,6 +58,7 @@
|
||||
fprintf( stderr, "%s error: unable to allocate %d bytes memory for db->dataBuffer\n",
|
||||
id, dataBufferSize );
|
||||
perror( "system message" );
|
||||
+ while( fflush( stderr ) );
|
||||
assert(0);
|
||||
}
|
||||
/*zzzzzzzzzzzzzz*/
|
||||
@@ -70,6 +71,7 @@
|
||||
{
|
||||
fprintf( stderr, "%s error: reading file %s into db->dataBuffer\n", id, db->parent.path );
|
||||
perror( "system message" ); \
|
||||
+ while( fflush( stderr ) );
|
||||
assert(0);
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- ./libMG/src/Makefile.am.orig Tue Dec 13 13:57:20 2005
|
||||
+++ ./libMG/src/Makefile.am Fri Dec 8 17:13:00 2006
|
||||
@@ -32,7 +32,7 @@
|
||||
MGrStrlen.c \
|
||||
MGxTermBarCreate.c \
|
||||
MGxTermBarDestroy.c \
|
||||
- MGxTermBarUpdate.c
|
||||
+ MGxTermBarUpdate.c
|
||||
|
||||
include_HEADERS = libMG.h
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
--- ./libMG/src/libMG.h.orig Tue Dec 13 13:56:16 2005
|
||||
+++ ./libMG/src/libMG.h Fri Dec 8 17:13:00 2006
|
||||
@@ -57,6 +57,7 @@
|
||||
#define KEY_a 97
|
||||
#define CLASS_TYPE_DB 1
|
||||
#define CLASS_TYPE_DIR 2
|
||||
+#define CLASS_TYPE_MEM 3
|
||||
#define CR 13
|
||||
#define DEBUG_MGdb 0
|
||||
#define DEBUG_MGdir 0
|
||||
@@ -77,15 +78,15 @@
|
||||
#define SINGLE_LINES "------------------------------------------------------------------------"
|
||||
#define DOUBLE_LINES "========================================================================"
|
||||
|
||||
- char** MGm__command;
|
||||
- int MGm__forkStatus;
|
||||
- pid_t MGm__pid;
|
||||
-struct stat fstatBuf;
|
||||
-struct stat lstatBuf;
|
||||
-typedef struct classDb classDb;
|
||||
-typedef struct classDir classDir;
|
||||
-unsigned int MGm__bufferSize;
|
||||
-unsigned int MGm__stringSize;
|
||||
+ char** MGm__command;
|
||||
+ int MGm__forkStatus;
|
||||
+ pid_t MGm__pid;
|
||||
+ struct stat fstatBuf;
|
||||
+ struct stat lstatBuf;
|
||||
+ unsigned int MGm__bufferSize;
|
||||
+ unsigned int MGm__stringSize;
|
||||
+typedef struct classDb classDb;
|
||||
+typedef struct classDir classDir;
|
||||
|
||||
#define MAXSTRINGSIZE 0x1ff
|
||||
#define MAXBUFFERSIZE 0xffff
|
||||
@@ -270,7 +271,7 @@
|
||||
int MGrInStringSwap( char* originalString, char* oldString, char* newString );
|
||||
int MGrStripComment( char*, char );
|
||||
unsigned int MGrBufferlen( char* buffer, unsigned int maxBufferSize );
|
||||
-unsigned int MGrStrlen( char* string );
|
||||
+unsigned int MGrStrlen( char* String );
|
||||
unsigned long int MGrFileTime( char* );
|
||||
|
||||
#endif
|
|
@ -1,11 +0,0 @@
|
|||
--- ./portmanager/patch-bsd.port.mk-0.3.6.orig Mon Dec 12 15:32:34 2005
|
||||
+++ ./portmanager/patch-bsd.port.mk-0.3.6 Fri Dec 8 17:13:00 2006
|
||||
@@ -5,7 +5,7 @@
|
||||
.endif
|
||||
.if !defined(PKG_ARGS)
|
||||
-PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
|
||||
-+PORTMANAGER= ${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends
|
||||
++PORTMANAGER= ${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends | ${GREP} -v -E "^MGPMr"
|
||||
+PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${PORTMANAGER} | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
|
||||
+###PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
|
||||
.if !defined(NO_MTREE)
|
|
@ -1,11 +0,0 @@
|
|||
--- portmanager/pkgtools-to-portmanager.rb.orig Fri Mar 2 21:28:59 2007
|
||||
+++ portmanager/pkgtools-to-portmanager.rb Fri Mar 2 21:30:46 2007
|
||||
@@ -38,6 +38,8 @@
|
||||
|
||||
puts "CATEGORY/PORT|OPTION=| # do not delete this line!"
|
||||
|
||||
+init_pkgtools_global
|
||||
+
|
||||
load_config
|
||||
|
||||
# held packages
|
|
@ -1,60 +0,0 @@
|
|||
--- portmanager/portmanager.1.orig Mon Feb 5 13:02:40 2007
|
||||
+++ portmanager/portmanager.1 Mon Feb 5 13:06:46 2007
|
||||
@@ -183,7 +183,7 @@
|
||||
config". To determine if options is defined in the port's directory
|
||||
run "grep OPTIONS Makefile". examples:
|
||||
.sp
|
||||
- cd /usr/ports/sysutils/portmanager
|
||||
+ cd /usr/ports/ports-mgmt/portmanager
|
||||
.sp
|
||||
grep OPTIONS Makefile
|
||||
.sp
|
||||
@@ -276,8 +276,8 @@
|
||||
.sp
|
||||
WITH_DEBUG
|
||||
.sp
|
||||
- a) set with either make config from sysutils/portmanager or
|
||||
-by adding \fBsysutils/portmanager|WITH_DEBUG=1|\fR to pm-020.conf
|
||||
+ a) set with either make config from ports-mgmt/portmanager or
|
||||
+by adding \fBports-mgmt/portmanager|WITH_DEBUG=1|\fR to pm-020.conf
|
||||
.sp
|
||||
b) effects: when portmanager is built all warnings are enabled
|
||||
and is built with -ggdb option so symbols may be seen with gdb debugger.
|
||||
@@ -363,16 +363,16 @@
|
||||
of some of FreeBSD's port system features:
|
||||
.sp
|
||||
########################################################################
|
||||
- # Makefile from /usr/ports/local/sysutils/somelocalportname/Makefile
|
||||
+ # Makefile from /usr/ports/local/ports-mgmt/somelocalportname/Makefile
|
||||
########################################################################
|
||||
PORTNAME= somelocalportname
|
||||
PORTVERSION= 0.1.0
|
||||
- CATEGORIES= local/sysutils
|
||||
+ CATEGORIES= local/ports-mgmt
|
||||
VALID_CATEGORIES+= \&${CATEGORIES} # for FreeBSD to accept our
|
||||
# local category
|
||||
.sp
|
||||
Simply add a "local" directory to /usr/ports and install your local ports under that directory. Where a normal FreeBSD
|
||||
-port may be in "sysutils/{portname} the example above would reside in "local/sysutils/{portname}".
|
||||
+port may be in "ports-mgmt/{portname} the example above would reside in "local/ports-mgmt/{portname}".
|
||||
.sp
|
||||
\fBcvsup hints\fR
|
||||
.sp
|
||||
@@ -411,7 +411,7 @@
|
||||
You may set port configurations in \fB/etc/make.conf\fR instead of pm\&-020.conf.
|
||||
The advantage to setting configuration in make.conf is they will apply when ever you
|
||||
manually interact with the ports tree or if you also use another ports management
|
||||
-program such as \fBsysutils/portupgrade\fR.
|
||||
+program such as \fBports-mgmt/portupgrade\fR.
|
||||
.sp
|
||||
example /etc/makefile.conf entries:
|
||||
.sp
|
||||
@@ -437,7 +437,7 @@
|
||||
#
|
||||
#Because I don't want my development version of portmanager
|
||||
#installing on top of the version in the ports tree
|
||||
- \&.if ${\&.CURDIR:M*/local/sysutils/portmanager}
|
||||
+ \&.if ${\&.CURDIR:M*/local/ports-mgmt/portmanager}
|
||||
PREFIX=/home/mike/TEMP
|
||||
\&.endif
|
||||
#
|
|
@ -1,17 +0,0 @@
|
|||
--- ./portmanager/portmanager.c.orig Mon Dec 12 19:20:58 2005
|
||||
+++ ./portmanager/portmanager.c Fri Dec 8 17:13:00 2006
|
||||
@@ -34,7 +34,13 @@
|
||||
int main( int argc, char** argv, char** argp)
|
||||
{
|
||||
int errorCode = 0;
|
||||
-
|
||||
+
|
||||
+ if ( getuid() != 0 )
|
||||
+ {
|
||||
+ fprintf( stderr, "%s must be run as root\n", argv[0] );
|
||||
+ exit( 1 );
|
||||
+ }
|
||||
+
|
||||
errorCode = MGPMrCommandLine( argc, (char**)argv, (char**)argp );
|
||||
exit( errorCode );
|
||||
}
|
|
@ -1,18 +0,0 @@
|
|||
FreeBSD port collection management. Update your ports easily. Great
|
||||
for users of KDE or GNOME who need to be concerned about how
|
||||
dependency ports are built.
|
||||
|
||||
**New options**
|
||||
|
||||
1) Single port update/add/rebuild examples:
|
||||
|
||||
portmanager x11/gnome2 updates/adds gnome2 and dependencies
|
||||
portmanager x11/gnome2 -f rebuilds gnome2 and dependencies
|
||||
|
||||
2) portmanager -u -f forces rebuild of everything
|
||||
|
||||
3) -sl showleaves and -slid delete leaves
|
||||
now no longer list build dependencies
|
||||
|
||||
Author: Michael C. Shultz <ringworm01@gmail.com>
|
||||
WWW: http://portmanager.sourceforge.net/
|
|
@ -1,21 +0,0 @@
|
|||
*
|
||||
* portmanager
|
||||
*
|
||||
* upgrade ports example:
|
||||
*
|
||||
* portmanager -u -ip editors/nedit editors/openoffice
|
||||
*
|
||||
* upgrades everything except nedit,open office and their dependencies
|
||||
*
|
||||
* portmanager x11/gnome2 -l
|
||||
*
|
||||
* upgrade gnome2 and its dependencies with logging enabled
|
||||
*
|
||||
* portmanager x11/gnome2 -l -f
|
||||
*
|
||||
* rebuild gnome2 and its dependencies
|
||||
*
|
||||
* portmanager -slid will let you safely remove leaf ports
|
||||
*
|
||||
* see man portmanager(1) or http://portmanager.sunsite.dk
|
||||
*
|
|
@ -1,28 +0,0 @@
|
|||
@unexec rm -f %D/etc/portmanager/pm-039-pkg-tools.conf 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/pkgtools.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/3strikes.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/commandLine.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/configure.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/configure.db.temp 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/ignore.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/pkg.db || true
|
||||
@unexec rm -f %D/share/portmanager/portCache.tmp 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/ports_available.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/ports_available_dependencies.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/ports_cache.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/ports_dependencies.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/ports_installed.db 2>/dev/null || true
|
||||
@unexec rm -f %D/share/portmanager/ports_old.db 2>/dev/null || true
|
||||
%%DATADIR%%/help.txt
|
||||
%%DATADIR%%/patch-bsd.port.mk-0.3.6
|
||||
%%DATADIR%%/pkgtools-to-portmanager.rb
|
||||
%%DATADIR%%/bsd.port.mk-BACKUP
|
||||
bin/portmanager
|
||||
etc/portmanager/pm-020.conf.SAMPLE
|
||||
include/libMG.h
|
||||
lib/libMG.so
|
||||
lib/libMG.so.2
|
||||
lib/libMGPM.so
|
||||
lib/libMGPM.so.1
|
||||
@dirrmtry etc/portmanager
|
||||
@dirrmtry share/portmanager
|
|
@ -372,7 +372,6 @@
|
|||
SUBDIR += libmrss-php
|
||||
SUBDIR += libnxml
|
||||
SUBDIR += libparsifal
|
||||
SUBDIR += libpathan
|
||||
SUBDIR += libroxml
|
||||
SUBDIR += libsoldout
|
||||
SUBDIR += libsphinxclient
|
||||
|
|
|
@ -1,43 +0,0 @@
|
|||
# Created by: Cheng-Lung Sung <clsung@dragon2.net>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= libpathan
|
||||
PORTVERSION= 2.0
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= textproc
|
||||
MASTER_SITES= http://software.decisionsoft.com/oldsite/software/pathan-2.0.0/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION}beta-src
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= Validating XML parser from the Apache XML Project
|
||||
|
||||
LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2
|
||||
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/textproc/xerces-c2:extract
|
||||
|
||||
DEPRECATED= Does not build and upstream has discontinued the project and advises that it has been replaced by textproc/xqilla
|
||||
EXPIRATION_DATE=2013-01-04
|
||||
|
||||
USE_BISON= build
|
||||
USE_GMAKE= yes
|
||||
USE_PERL5= yes
|
||||
GNU_CONFIGURE= yes
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}beta
|
||||
USE_LDCONFIG= yes
|
||||
XERCESCROOT= `cd ${PORTSDIR}/textproc/xerces-c2; ${MAKE} -V WRKSRC`
|
||||
CONFIGURE_ENV+= XERCESCROOT=${XERCESCROOT}
|
||||
CONFIGURE_SCRIPT= runConfigure
|
||||
CONFIGURE_ARGS+= --disable-static
|
||||
|
||||
PATHAN_LIB_VERSION= 3
|
||||
PLIST_SUB+= PATHAN_LIB_VERSION=${PATHAN_LIB_VERSION}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|LIBS="-lpthread|LIBS="${PTHREAD_LIBS}|g ; s|echo aout|echo elf|' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|targetoptions="-O2"|targetoptions="${CFLAGS}"|g' \
|
||||
${WRKSRC}/runConfigure
|
||||
${FIND} ${WRKSRC}/include/pathan -name "*.orig" -delete
|
||||
|
||||
.include <bsd.port.post.mk>
|
|
@ -1,2 +0,0 @@
|
|||
SHA256 (libpathan-2.0beta-src.tar.gz) = a2d5ed2111423217729daf9bda0c3ab458799aeccf008fdd5313c17ac3cbb31d
|
||||
SIZE (libpathan-2.0beta-src.tar.gz) = 1090985
|
|
@ -1,14 +0,0 @@
|
|||
--- Makefile.defs.in.orig Mon Aug 9 20:19:33 2004
|
||||
+++ Makefile.defs.in Wed Nov 1 23:18:35 2006
|
||||
@@ -20,9 +20,9 @@
|
||||
DEFINES = -D@system_type@
|
||||
XERCESINCPATH = -I@xerces_src@
|
||||
INCPATH = ${XERCESINCPATH} -I$(srcdir)/src -I$(srcincdir)
|
||||
-LIBPATH = -L@xerces_lib@
|
||||
+LIBPATH = -L@xerces_lib@ -L/usr/local/lib
|
||||
TESTFLAGS = -DTEST
|
||||
-XERCESLIB = -l@xerces_library@
|
||||
+XERCESLIB = -lxerces-c -liconv
|
||||
LIBS = @LIBS@ -lm -lstdc++
|
||||
|
||||
###### Output directories
|
|
@ -1,11 +0,0 @@
|
|||
--- include/pathan/PathanImplementation.hpp.orig Fri Dec 22 15:28:34 2006
|
||||
+++ include/pathan/PathanImplementation.hpp Fri Dec 22 15:29:08 2006
|
||||
@@ -184,7 +184,7 @@
|
||||
* the feature to see if it requires this method.
|
||||
* @since DOM Level 2
|
||||
*/
|
||||
- virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType *PathanImplementation::createDocumentType(const XMLCh *qualifiedName,const XMLCh * publicId, const XMLCh *systemId);
|
||||
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType *createDocumentType(const XMLCh *qualifiedName,const XMLCh * publicId, const XMLCh *systemId);
|
||||
|
||||
/**
|
||||
* This method makes available a <code>DOMImplementation</code>'s
|
|
@ -1,11 +0,0 @@
|
|||
--- include/pathan/XPath2Utils.hpp.orig Fri Dec 22 15:25:39 2006
|
||||
+++ include/pathan/XPath2Utils.hpp Fri Dec 22 15:26:03 2006
|
||||
@@ -62,7 +62,7 @@
|
||||
static std::vector<const XMLCh*> getVal(const XMLCh* values, XPath2MemoryManager* memMgr);
|
||||
|
||||
/* Determine whether or not an XMLCh* is contained within a vector of XMLCh's */
|
||||
- static bool XPath2Utils::containsString(std::vector<const XMLCh*> values, const XMLCh* val);
|
||||
+ static bool containsString(std::vector<const XMLCh*> values, const XMLCh* val);
|
||||
|
||||
/** Obtain index of node with respect to it's siblings of same name */
|
||||
static int indexNode(const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *node);
|
|
@ -1,25 +0,0 @@
|
|||
--- src/context/DynamicContextImpl.cpp.orig Mon Aug 9 20:19:54 2004
|
||||
+++ src/context/DynamicContextImpl.cpp Fri Nov 3 11:52:11 2006
|
||||
@@ -39,6 +39,13 @@
|
||||
|
||||
static CodepointCollation g_codepointCollation;
|
||||
|
||||
+inline int gettimezone()
|
||||
+{
|
||||
+ time_t tt;
|
||||
+ time(&tt);
|
||||
+ struct tm *tm_p = gmtime(&tt);
|
||||
+ return (int)mktime(tm_p) - (int)tt;
|
||||
+}
|
||||
DynamicContextImpl::DynamicContextImpl(const StaticContext *staticContext, XPath2MemoryManager* memMgr)
|
||||
: _staticContext(staticContext),
|
||||
_nsResolver(staticContext->getNSResolver()),
|
||||
@@ -148,7 +155,7 @@
|
||||
tz = _timezone;
|
||||
#else /*WIN32*/
|
||||
tzset ();
|
||||
- tz = timezone;
|
||||
+ tz = gettimezone();
|
||||
#endif
|
||||
// validate tzone
|
||||
Timezone tzone(tz);
|
|
@ -1,33 +0,0 @@
|
|||
--- src/context/XPath2ContextImpl.cpp.orig Mon Aug 9 20:19:54 2004
|
||||
+++ src/context/XPath2ContextImpl.cpp Fri Nov 3 11:51:57 2006
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
+#include <time.h>
|
||||
#include <pathan/VariableStore.hpp>
|
||||
#include <pathan/simpleVariables/VariableTypeStore.hpp>
|
||||
#include <pathan/XPath2NSUtils.hpp>
|
||||
@@ -41,6 +42,13 @@
|
||||
|
||||
static CodepointCollation g_codepointCollation;
|
||||
|
||||
+inline int gettimezone()
|
||||
+{
|
||||
+ time_t tt;
|
||||
+ time(&tt);
|
||||
+ struct tm *tm_p = gmtime(&tt);
|
||||
+ return (int)mktime(tm_p) - (int)tt;
|
||||
+}
|
||||
XPath2ContextImpl::XPath2ContextImpl(XPath2MemoryManager* memMgr,
|
||||
XERCES_CPP_NAMESPACE_QUALIFIER XMLGrammarPool* xmlgr,
|
||||
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode* contextNode) :
|
||||
@@ -177,7 +185,7 @@
|
||||
tz = _timezone;
|
||||
#else /*WIN32*/
|
||||
tzset ();
|
||||
- tz = timezone;
|
||||
+ tz = gettimezone();
|
||||
#endif
|
||||
// validate tzone
|
||||
Timezone tzone(tz);
|
|
@ -1,11 +0,0 @@
|
|||
--- src/sequence/Sequence.cpp.orig Fri Nov 3 10:59:39 2006
|
||||
+++ src/sequence/Sequence.cpp Fri Nov 3 10:59:18 2006
|
||||
@@ -214,7 +214,7 @@
|
||||
|
||||
Sequence result(context->getMemoryManager());
|
||||
|
||||
- const_iterator end(end());
|
||||
+ Sequence::const_iterator end(Sequence::end());
|
||||
for(const_iterator i = begin(); i != end; ++i)
|
||||
{
|
||||
if((*i)->isNode())
|
|
@ -1,22 +0,0 @@
|
|||
The Pathan project grew out of DecisionSoft's work on XMLScript , an
|
||||
XML transformation language.
|
||||
|
||||
XPath was adopted as a node selection language by XMLScript when the XPath
|
||||
specification was ratified by the W3C. DecisionSoft's XMLScript processor
|
||||
is based on Xerces-C, a Document Object Model compliant XML parser. Pathan
|
||||
therefore was designed from the base up to be fully compatible with the
|
||||
Xerces parser.
|
||||
|
||||
Pathan 1 represents the open sourcing of the XPath component of
|
||||
DecisionSoft's XMLScript processor. Pathan 1 features a full implementation
|
||||
of the XPath 1.0 Specification. Pathan 1 implements the W3C DOM Level 3
|
||||
XPath Specification (Working Draft February 08 2002) providing a powerful
|
||||
and coherent interface between XPath and DOM and hence a standardised
|
||||
interface with Xerces.
|
||||
|
||||
Pathan is provided to the community as we feel that the Pathan module
|
||||
increases the scope and usefulness of the Xerces-C library and will be
|
||||
an aid to other XML developers in their projects.
|
||||
|
||||
For information on Pathan 1 please see their homepage
|
||||
WWW: http://software.decisionsoft.com/
|
|
@ -1,279 +0,0 @@
|
|||
include/pathan/ATAnySimpleType.hpp
|
||||
include/pathan/ATAnyURIOrDerived.hpp
|
||||
include/pathan/ATBase64BinaryOrDerived.hpp
|
||||
include/pathan/ATBooleanOrDerived.hpp
|
||||
include/pathan/ATDateOrDerived.hpp
|
||||
include/pathan/ATDateTimeOrDerived.hpp
|
||||
include/pathan/ATDecimalOrDerived.hpp
|
||||
include/pathan/ATDoubleOrDerived.hpp
|
||||
include/pathan/ATDurationOrDerived.hpp
|
||||
include/pathan/ATFloatOrDerived.hpp
|
||||
include/pathan/ATGDayOrDerived.hpp
|
||||
include/pathan/ATGMonthDayOrDerived.hpp
|
||||
include/pathan/ATGMonthOrDerived.hpp
|
||||
include/pathan/ATGYearMonthOrDerived.hpp
|
||||
include/pathan/ATGYearOrDerived.hpp
|
||||
include/pathan/ATHexBinaryOrDerived.hpp
|
||||
include/pathan/ATNotationOrDerived.hpp
|
||||
include/pathan/ATQNameOrDerived.hpp
|
||||
include/pathan/ATStringOrDerived.hpp
|
||||
include/pathan/ATTimeOrDerived.hpp
|
||||
include/pathan/ATUntypedAtomic.hpp
|
||||
include/pathan/AnyAtomicType.hpp
|
||||
include/pathan/Collation.hpp
|
||||
include/pathan/DateOrTimeType.hpp
|
||||
include/pathan/DocumentCache.hpp
|
||||
include/pathan/DynamicContext.hpp
|
||||
include/pathan/Item.hpp
|
||||
include/pathan/Node.hpp
|
||||
include/pathan/Numeric.hpp
|
||||
include/pathan/Pathan.hpp
|
||||
include/pathan/PathanEngine.hpp
|
||||
include/pathan/PathanException.hpp
|
||||
include/pathan/PathanExpression.hpp
|
||||
include/pathan/PathanImplementation.hpp
|
||||
include/pathan/PathanNSResolver.hpp
|
||||
include/pathan/PathanPlatformUtils.hpp
|
||||
include/pathan/PathanTypeInfo.hpp
|
||||
include/pathan/Sequence.hpp
|
||||
include/pathan/SequenceType.hpp
|
||||
include/pathan/StaticContext.hpp
|
||||
include/pathan/Timezone.hpp
|
||||
include/pathan/URIResolver.hpp
|
||||
include/pathan/ValidationContext.hpp
|
||||
include/pathan/VariableStore.hpp
|
||||
include/pathan/XPath2MemoryManager.hpp
|
||||
include/pathan/XPath2NSUtils.hpp
|
||||
include/pathan/XPath2NodeSerializer.hpp
|
||||
include/pathan/XPath2Result.hpp
|
||||
include/pathan/XPath2Utils.hpp
|
||||
include/pathan/dataItem/DataItem.hpp
|
||||
include/pathan/dataItem/DataItemCastAs.hpp
|
||||
include/pathan/dataItem/DataItemCastableAs.hpp
|
||||
include/pathan/dataItem/DataItemContextItem.hpp
|
||||
include/pathan/dataItem/DataItemFor.hpp
|
||||
include/pathan/dataItem/DataItemFunction.hpp
|
||||
include/pathan/dataItem/DataItemIf.hpp
|
||||
include/pathan/dataItem/DataItemImpl.hpp
|
||||
include/pathan/dataItem/DataItemInstanceOf.hpp
|
||||
include/pathan/dataItem/DataItemLiteral.hpp
|
||||
include/pathan/dataItem/DataItemNav.hpp
|
||||
include/pathan/dataItem/DataItemOperator.hpp
|
||||
include/pathan/dataItem/DataItemParenthesizedExpr.hpp
|
||||
include/pathan/dataItem/DataItemQuantifiedExpr.hpp
|
||||
include/pathan/dataItem/DataItemSequence.hpp
|
||||
include/pathan/dataItem/DataItemStep.hpp
|
||||
include/pathan/dataItem/DataItemTreatAs.hpp
|
||||
include/pathan/dataItem/DataItemVariable.hpp
|
||||
include/pathan/dataItem/StaticResolutionContext.hpp
|
||||
include/pathan/exceptions/ContextException.hpp
|
||||
include/pathan/exceptions/DSLException.hpp
|
||||
include/pathan/exceptions/DataItemException.hpp
|
||||
include/pathan/exceptions/FunctionException.hpp
|
||||
include/pathan/exceptions/IllegalArgumentException.hpp
|
||||
include/pathan/exceptions/ItemException.hpp
|
||||
include/pathan/exceptions/NamespaceLookupException.hpp
|
||||
include/pathan/exceptions/NavigationException.hpp
|
||||
include/pathan/exceptions/StaticAnalysisException.hpp
|
||||
include/pathan/exceptions/TypeNotFoundException.hpp
|
||||
include/pathan/exceptions/VariableStoreException.hpp
|
||||
include/pathan/exceptions/XMLParseException.hpp
|
||||
include/pathan/exceptions/XPath2ErrorException.hpp
|
||||
include/pathan/functionAPI/AggregateFunction.hpp
|
||||
include/pathan/functionAPI/ConstantFoldingFunction.hpp
|
||||
include/pathan/functionAPI/DatatypeLookup.hpp
|
||||
include/pathan/functionAPI/FunctionLookup.hpp
|
||||
include/pathan/functionAPI/NumericFunction.hpp
|
||||
include/pathan/functions/FunctionAbs.hpp
|
||||
include/pathan/functions/FunctionAdjustDateTimeToTimezone.hpp
|
||||
include/pathan/functions/FunctionAdjustDateToTimezone.hpp
|
||||
include/pathan/functions/FunctionAdjustTimeToTimezone.hpp
|
||||
include/pathan/functions/FunctionAvg.hpp
|
||||
include/pathan/functions/FunctionBaseURI.hpp
|
||||
include/pathan/functions/FunctionBoolean.hpp
|
||||
include/pathan/functions/FunctionCeiling.hpp
|
||||
include/pathan/functions/FunctionCodepointsToString.hpp
|
||||
include/pathan/functions/FunctionCollection.hpp
|
||||
include/pathan/functions/FunctionCompare.hpp
|
||||
include/pathan/functions/FunctionConcat.hpp
|
||||
include/pathan/functions/FunctionConstructor.hpp
|
||||
include/pathan/functions/FunctionContains.hpp
|
||||
include/pathan/functions/FunctionCount.hpp
|
||||
include/pathan/functions/FunctionCurrentDate.hpp
|
||||
include/pathan/functions/FunctionCurrentDateTime.hpp
|
||||
include/pathan/functions/FunctionCurrentTime.hpp
|
||||
include/pathan/functions/FunctionData.hpp
|
||||
include/pathan/functions/FunctionDayFromDate.hpp
|
||||
include/pathan/functions/FunctionDayFromDateTime.hpp
|
||||
include/pathan/functions/FunctionDaysFromDuration.hpp
|
||||
include/pathan/functions/FunctionDeepEqual.hpp
|
||||
include/pathan/functions/FunctionDefaultCollation.hpp
|
||||
include/pathan/functions/FunctionDistinctValues.hpp
|
||||
include/pathan/functions/FunctionDoc.hpp
|
||||
include/pathan/functions/FunctionDocumentURI.hpp
|
||||
include/pathan/functions/FunctionEmpty.hpp
|
||||
include/pathan/functions/FunctionEndsWith.hpp
|
||||
include/pathan/functions/FunctionError.hpp
|
||||
include/pathan/functions/FunctionEscapeURI.hpp
|
||||
include/pathan/functions/FunctionExactlyOne.hpp
|
||||
include/pathan/functions/FunctionExists.hpp
|
||||
include/pathan/functions/FunctionExpandedQName.hpp
|
||||
include/pathan/functions/FunctionFalse.hpp
|
||||
include/pathan/functions/FunctionFloor.hpp
|
||||
include/pathan/functions/FunctionHoursFromDateTime.hpp
|
||||
include/pathan/functions/FunctionHoursFromDuration.hpp
|
||||
include/pathan/functions/FunctionHoursFromTime.hpp
|
||||
include/pathan/functions/FunctionId.hpp
|
||||
include/pathan/functions/FunctionIdref.hpp
|
||||
include/pathan/functions/FunctionImplicitTimezone.hpp
|
||||
include/pathan/functions/FunctionInScopePrefixes.hpp
|
||||
include/pathan/functions/FunctionIndexOf.hpp
|
||||
include/pathan/functions/FunctionInsertBefore.hpp
|
||||
include/pathan/functions/FunctionLang.hpp
|
||||
include/pathan/functions/FunctionLast.hpp
|
||||
include/pathan/functions/FunctionLocalNameFromQName.hpp
|
||||
include/pathan/functions/FunctionLocalname.hpp
|
||||
include/pathan/functions/FunctionLowerCase.hpp
|
||||
include/pathan/functions/FunctionMatches.hpp
|
||||
include/pathan/functions/FunctionMax.hpp
|
||||
include/pathan/functions/FunctionMin.hpp
|
||||
include/pathan/functions/FunctionMinutesFromDateTime.hpp
|
||||
include/pathan/functions/FunctionMinutesFromDuration.hpp
|
||||
include/pathan/functions/FunctionMinutesFromTime.hpp
|
||||
include/pathan/functions/FunctionMonthFromDate.hpp
|
||||
include/pathan/functions/FunctionMonthFromDateTime.hpp
|
||||
include/pathan/functions/FunctionMonthsFromDuration.hpp
|
||||
include/pathan/functions/FunctionName.hpp
|
||||
include/pathan/functions/FunctionNamespaceURIForPrefix.hpp
|
||||
include/pathan/functions/FunctionNamespaceURIFromQName.hpp
|
||||
include/pathan/functions/FunctionNamespaceUri.hpp
|
||||
include/pathan/functions/FunctionNilled.hpp
|
||||
include/pathan/functions/FunctionNodeName.hpp
|
||||
include/pathan/functions/FunctionNormalizeSpace.hpp
|
||||
include/pathan/functions/FunctionNormalizeUnicode.hpp
|
||||
include/pathan/functions/FunctionNot.hpp
|
||||
include/pathan/functions/FunctionNumber.hpp
|
||||
include/pathan/functions/FunctionOneOrMore.hpp
|
||||
include/pathan/functions/FunctionPosition.hpp
|
||||
include/pathan/functions/FunctionRemove.hpp
|
||||
include/pathan/functions/FunctionReplace.hpp
|
||||
include/pathan/functions/FunctionResolveQName.hpp
|
||||
include/pathan/functions/FunctionResolveURI.hpp
|
||||
include/pathan/functions/FunctionReverse.hpp
|
||||
include/pathan/functions/FunctionRoot.hpp
|
||||
include/pathan/functions/FunctionRound.hpp
|
||||
include/pathan/functions/FunctionRoundHalfToEven.hpp
|
||||
include/pathan/functions/FunctionSecondsFromDateTime.hpp
|
||||
include/pathan/functions/FunctionSecondsFromDuration.hpp
|
||||
include/pathan/functions/FunctionSecondsFromTime.hpp
|
||||
include/pathan/functions/FunctionStartsWith.hpp
|
||||
include/pathan/functions/FunctionString.hpp
|
||||
include/pathan/functions/FunctionStringJoin.hpp
|
||||
include/pathan/functions/FunctionStringLength.hpp
|
||||
include/pathan/functions/FunctionStringToCodepoints.hpp
|
||||
include/pathan/functions/FunctionSubsequence.hpp
|
||||
include/pathan/functions/FunctionSubstring.hpp
|
||||
include/pathan/functions/FunctionSubstringAfter.hpp
|
||||
include/pathan/functions/FunctionSubstringBefore.hpp
|
||||
include/pathan/functions/FunctionSubtractDateTimesYieldingDayTimeDuration.hpp
|
||||
include/pathan/functions/FunctionSubtractDateTimesYieldingYearMonthDuration.hpp
|
||||
include/pathan/functions/FunctionSubtractDatesYieldingDayTimeDuration.hpp
|
||||
include/pathan/functions/FunctionSubtractDatesYieldingYearMonthDuration.hpp
|
||||
include/pathan/functions/FunctionSum.hpp
|
||||
include/pathan/functions/FunctionTimezoneFromDate.hpp
|
||||
include/pathan/functions/FunctionTimezoneFromDateTime.hpp
|
||||
include/pathan/functions/FunctionTimezoneFromTime.hpp
|
||||
include/pathan/functions/FunctionTokenize.hpp
|
||||
include/pathan/functions/FunctionTrace.hpp
|
||||
include/pathan/functions/FunctionTranslate.hpp
|
||||
include/pathan/functions/FunctionTrue.hpp
|
||||
include/pathan/functions/FunctionUnordered.hpp
|
||||
include/pathan/functions/FunctionUpperCase.hpp
|
||||
include/pathan/functions/FunctionYearFromDate.hpp
|
||||
include/pathan/functions/FunctionYearFromDateTime.hpp
|
||||
include/pathan/functions/FunctionYearsFromDuration.hpp
|
||||
include/pathan/functions/FunctionZeroOrOne.hpp
|
||||
include/pathan/internal/AnyAtomicTypeDatatypeValidator.hpp
|
||||
include/pathan/internal/DOMutils/XMLChCompare.hpp
|
||||
include/pathan/internal/DOMutils/XStr.hpp
|
||||
include/pathan/internal/ProxyMemoryManager.hpp
|
||||
include/pathan/internal/XPath2MemoryManagerImpl.hpp
|
||||
include/pathan/internal/collations/CodepointCollation.hpp
|
||||
include/pathan/internal/collations/CollationImpl.hpp
|
||||
include/pathan/internal/context/DocumentCacheImpl.hpp
|
||||
include/pathan/internal/context/DynamicContextImpl.hpp
|
||||
include/pathan/internal/context/XPath2ContextImpl.hpp
|
||||
include/pathan/internal/dom-extensions/PathanExpressionImpl.hpp
|
||||
include/pathan/internal/dom-extensions/PathanNSResolverImpl.hpp
|
||||
include/pathan/internal/factory/DatatypeFactory.hpp
|
||||
include/pathan/internal/factory/FuncFactory.hpp
|
||||
include/pathan/internal/items/ATDecimalOrDerivedImpl.hpp
|
||||
include/pathan/internal/items/ATDoubleOrDerivedImpl.hpp
|
||||
include/pathan/internal/m_apm.h
|
||||
include/pathan/internal/navigation/AncestorAxis.hpp
|
||||
include/pathan/internal/navigation/AncestorOrSelfAxis.hpp
|
||||
include/pathan/internal/navigation/AttributeAxis.hpp
|
||||
include/pathan/internal/navigation/ChildAxis.hpp
|
||||
include/pathan/internal/navigation/DescendantAxis.hpp
|
||||
include/pathan/internal/navigation/DescendantOrSelfAxis.hpp
|
||||
include/pathan/internal/navigation/FollowingAxis.hpp
|
||||
include/pathan/internal/navigation/FollowingSiblingAxis.hpp
|
||||
include/pathan/internal/navigation/ForwardAxis.hpp
|
||||
include/pathan/internal/navigation/NamespaceAxis.hpp
|
||||
include/pathan/internal/navigation/NavStepImpl.hpp
|
||||
include/pathan/internal/navigation/ParentAxis.hpp
|
||||
include/pathan/internal/navigation/PrecedingAxis.hpp
|
||||
include/pathan/internal/navigation/PrecedingSiblingAxis.hpp
|
||||
include/pathan/internal/navigation/ReverseAxis.hpp
|
||||
include/pathan/internal/navigation/SelfAxis.hpp
|
||||
include/pathan/internal/parser/QName.hpp
|
||||
include/pathan/internal/parser/VariableBinding.hpp
|
||||
include/pathan/internal/simpleVariables/VarHashEntryImpl.hpp
|
||||
include/pathan/operators/And.hpp
|
||||
include/pathan/operators/Divide.hpp
|
||||
include/pathan/operators/Equals.hpp
|
||||
include/pathan/operators/Except.hpp
|
||||
include/pathan/operators/GeneralComp.hpp
|
||||
include/pathan/operators/GreaterThan.hpp
|
||||
include/pathan/operators/GreaterThanEqual.hpp
|
||||
include/pathan/operators/IntegerDivide.hpp
|
||||
include/pathan/operators/Intersect.hpp
|
||||
include/pathan/operators/LessThan.hpp
|
||||
include/pathan/operators/LessThanEqual.hpp
|
||||
include/pathan/operators/Minus.hpp
|
||||
include/pathan/operators/Mod.hpp
|
||||
include/pathan/operators/Multiply.hpp
|
||||
include/pathan/operators/NodeComparison.hpp
|
||||
include/pathan/operators/NotEquals.hpp
|
||||
include/pathan/operators/Or.hpp
|
||||
include/pathan/operators/OrderComparison.hpp
|
||||
include/pathan/operators/Plus.hpp
|
||||
include/pathan/operators/Range.hpp
|
||||
include/pathan/operators/UnaryMinus.hpp
|
||||
include/pathan/operators/Union.hpp
|
||||
include/pathan/simpleVariables/Scope.hpp
|
||||
include/pathan/simpleVariables/VarHashEntry.hpp
|
||||
include/pathan/simpleVariables/VariableStoreTemplate.hpp
|
||||
include/pathan/simpleVariables/VariableTypeStore.hpp
|
||||
@dirrm include/pathan/simpleVariables
|
||||
@dirrm include/pathan/operators
|
||||
@dirrm include/pathan/internal/simpleVariables
|
||||
@dirrm include/pathan/internal/parser
|
||||
@dirrm include/pathan/internal/navigation
|
||||
@dirrm include/pathan/internal/items
|
||||
@dirrm include/pathan/internal/factory
|
||||
@dirrm include/pathan/internal/dom-extensions
|
||||
@dirrm include/pathan/internal/context
|
||||
@dirrm include/pathan/internal/collations
|
||||
@dirrm include/pathan/internal/DOMutils
|
||||
@dirrm include/pathan/internal
|
||||
@dirrm include/pathan/functions
|
||||
@dirrm include/pathan/functionAPI
|
||||
@dirrm include/pathan/exceptions
|
||||
@dirrm include/pathan/dataItem
|
||||
@dirrm include/pathan
|
||||
lib/libpathan.la
|
||||
lib/libpathan.so.%%PATHAN_LIB_VERSION%%
|
||||
@exec ln -sf libpathan.so.%%PATHAN_LIB_VERSION%% %D/lib/libpathan.so
|
||||
@unexec if test ! -r %D/lib/libpathan.so; then rm -f %D/lib/libpathan.so; fi
|
||||
@unexec if test ! -r %D/lib/libpathan.so.%%PATHAN_LIB_VERSION%%; then rm -f %D/lib/libpathan.so.%%PATHAN_LIB_VERSION%%; fi
|
Loading…
Add table
Reference in a new issue