diff --git a/MOVED b/MOVED index 723aea94e613..93a21b099ba8 100644 --- a/MOVED +++ b/MOVED @@ -6233,3 +6233,5 @@ security/sudosh2||2014-07-01|Has expired: Funcition replaced by sudo -s lang/pike76|lang/pike78|2014-07-01|Has expired: Outdated: Users should switch to lang/pike78 editors/gummi||2014-07-01|Has expired: Builds fine but the program itself is unusable archivers/rpm|archivers/rpm4|2014-07-03|rpm3 is long EOLed, rpm4 is the default rpm archivers for most of linux distributions +x11-clocks/wmitime||2014-07-04|Has expired +x11/xorg-edit||2014-07-04|Has expired: Depends on older version of wxGTK diff --git a/x11-clocks/Makefile b/x11-clocks/Makefile index dc350c6a15a6..b1dfe3588da3 100644 --- a/x11-clocks/Makefile +++ b/x11-clocks/Makefile @@ -53,7 +53,6 @@ SUBDIR += wmclockmon SUBDIR += wmfishtime SUBDIR += wmfuzzy - SUBDIR += wmitime SUBDIR += wmtime SUBDIR += wmtimer SUBDIR += xalarm diff --git a/x11-clocks/wmitime/Makefile b/x11-clocks/wmitime/Makefile deleted file mode 100644 index 3889b2526c54..000000000000 --- a/x11-clocks/wmitime/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Jim Mock -# $FreeBSD$ - -PORTNAME= wmitime -PORTVERSION= 0.3 -PORTREVISION= 2 -CATEGORIES= x11-clocks windowmaker afterstep -MASTER_SITES= http://dockapps.org/files/22/29/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Clock dockapp that shows the date, time, and internet time - -BROKEN= No public distfiles -EXPIRATION_DATE= 2014-07-04 - -WRKSRC= ${WRKDIR}/wmitime/wmitime - -PLIST_FILES= bin/wmitime -USE_XORG= xpm -USE_CSTD= gnu89 - -.include diff --git a/x11-clocks/wmitime/distinfo b/x11-clocks/wmitime/distinfo deleted file mode 100644 index ef593411dd5c..000000000000 --- a/x11-clocks/wmitime/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (wmitime-0.3.tar.gz) = fcec441bac183ac2fbbbf9d577c2eaaf9b9e0292a6041256e5a4286a76cddc61 -SIZE (wmitime-0.3.tar.gz) = 21442 diff --git a/x11-clocks/wmitime/files/patch-aa b/x11-clocks/wmitime/files/patch-aa deleted file mode 100644 index ed9398b1b546..000000000000 --- a/x11-clocks/wmitime/files/patch-aa +++ /dev/null @@ -1,54 +0,0 @@ ---- Makefile.orig Mon Mar 29 12:51:39 1999 -+++ Makefile Sat Aug 12 01:03:21 2000 -@@ -1,7 +1,9 @@ --#LANG = fr --LIBDIR = -L/usr/X11R6/lib -+CC ?= gcc -+CFLAGS ?= -O2 -+INCDIR = -I${LOCALBASE}/include -+DESTDIR = ${PREFIX} -+LIBDIR = -L${LOCALBASE}/lib - LIBS = -lXpm -lXext -lX11 -lm --FLAGS = -O2 - OBJS = wmitime.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ -@@ -9,10 +11,10 @@ - - - .c.o: -- cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o -+ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR) - - wmtime: $(OBJS) -- cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS) -+ $(CC) $(CFLAGS) $(SYSTEM) -o wmitime $(OBJS) $(LIBDIR) $(LIBS) - - all:: wmtime - -@@ -24,24 +26,5 @@ - rm -f *~ - - install:: wmitime -- cp -f wmitime /usr/local/bin/ -- chmod 755 /usr/local/bin/wmitime -- chown root:root /usr/local/bin/wmitime --# cp wminetrc $(HOME)/.wminetrc --# chmod 600 $(HOME)/.wminetrc --# cp wminetrc /etc/wminetrc --# chmod 644 /etc/wminetrc -+ ${BSD_INSTALL_PROGRAM} wmitime $(DESTDIR)/bin - @echo "wmitime Installation finished..." -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/x11-clocks/wmitime/files/patch-ab b/x11-clocks/wmitime/files/patch-ab deleted file mode 100644 index 87370ada5180..000000000000 --- a/x11-clocks/wmitime/files/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ ---- wmitime.c.orig Fri Aug 6 15:12:36 1999 -+++ wmitime.c Fri Aug 6 15:10:34 1999 -@@ -281,7 +281,7 @@ - - // Compute Inet Time - iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec); -- iTime=iTime+((timezone-1)+3600); -+ iTime=iTime+((1-clk->tm_gmtoff)+3600); - if (clk->tm_isdst) - iTime-=3600; - iTime=(iTime*1000)/86400; -@@ -398,7 +398,7 @@ - - // Calculate Wheel Position... - iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec); -- iTime=iTime+((timezone-1)+3600); -+ iTime=iTime+((1-clk->tm_gmtoff)+3600); - if (clk->tm_isdst) - iTime-=3600; - iTime=(iTime*1000)/8640; diff --git a/x11-clocks/wmitime/pkg-descr b/x11-clocks/wmitime/pkg-descr deleted file mode 100644 index 924ac314e2d3..000000000000 --- a/x11-clocks/wmitime/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -WMitime is yet another clock dockapp (and quite overglorified at that) -it shows standard time, date, as well as the new internet time. For -more info on internet time, see http://www.swatch.com/ - -WWW: http://dockapps.org/file.php/id/22 diff --git a/x11/Makefile b/x11/Makefile index e49c82c7dc07..899762a9df6d 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -426,7 +426,6 @@ SUBDIR += xorg-apps SUBDIR += xorg-cf-files SUBDIR += xorg-docs - SUBDIR += xorg-edit SUBDIR += xorg-libraries SUBDIR += xorg-minimal SUBDIR += xplsprinters diff --git a/x11/xorg-edit/Makefile b/x11/xorg-edit/Makefile deleted file mode 100644 index 9636e526b909..000000000000 --- a/x11/xorg-edit/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# Created by: Andrew Pantyukhin -# $FreeBSD$ - -PORTNAME= xorg-edit -PORTVERSION= 08.08.06 -CATEGORIES= x11 -MASTER_SITES= SF -DISTNAME= ${PORTNAME}-${PORTVERSION}_src - -MAINTAINER= ports@FreeBSD.org -COMMENT= GUI to edit xorg.conf - -DEPRECATED= Depends on older version of wxGTK -EXPIRATION_DATE= 2014-07-04 - -LICENSE= GPLv3 - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -USES= dos2unix gmake tar:bzip2 -DOS2UNIX_GLOB= *.cpp *.h -USE_WX= 3.0 -WX_UNICODE= yes - -PLIST_FILES= bin/xorg-edit \ - lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \ - lib/xorg-edit/options/devices/example.xml \ - lib/xorg-edit/options/devices/list.xml \ - lib/xorg-edit/options/devices/nvidia.xml \ - lib/xorg-edit/xorg-edit -PLIST_DIRS= lib/xorg-edit/options/devices \ - lib/xorg-edit/options \ - lib/xorg-edit/de_DE/LC_MESSAGES \ - lib/xorg-edit/de_DE \ - lib/xorg-edit - -DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true - -post-patch: - @${REINPLACE_CMD} -e \ - 's|^CXX =|CXX ?=| ; \ - s|^CXXFLAGS =|CXXFLAGS ?=|' ${WRKSRC}/libxorgedit/Makefile - @${REINPLACE_CMD} -e \ - 's|^CXXFLAGS =|CXXFLAGS +=| ; \ - s|wx-config|$$(WX_CONFIG)| ; \ - s|-O3|| ; \ - s|^CXX =|CXX ?=| ; \ - s|^LDFLAGS =|LDFLAGS +=| ; \ - s|^$$(OBJECTS).*|%.o: %.c|' ${WRKSRC}/xorgedit/Makefile - -do-configure: - @${ECHO_CMD} -n > ${WRKDIR}/xorg-edit - @${ECHO_CMD} '#!/bin/sh' >> ${WRKDIR}/xorg-edit - @${ECHO_CMD} 'cd ${PREFIX}/lib/xorg-edit && ./xorg-edit "$$@"' \ - >> ${WRKDIR}/xorg-edit - @${ECHO_CMD} -n > ${WRKSRC}/Makefile - @${ECHO_CMD} 'all:' >> ${WRKSRC}/Makefile - @${ECHO_CMD} ' $$(MAKE) -C libxorgedit' >> ${WRKSRC}/Makefile - @${ECHO_CMD} ' $$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile - -do-install: - (cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${STAGEDIR}${PREFIX}/bin) - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit - (cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \ - ${STAGEDIR}${PREFIX}/lib/xorg-edit) - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES - (cd ${WRKSRC}/de_DE/LC_MESSAGES && ${INSTALL_DATA} ${PORTNAME}.mo \ - ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES) - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices - (cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \ - ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices) - -.include diff --git a/x11/xorg-edit/distinfo b/x11/xorg-edit/distinfo deleted file mode 100644 index cc8ed6063d00..000000000000 --- a/x11/xorg-edit/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg-edit-08.08.06_src.tar.bz2) = 93b189c276df9bae9d9bfbb4212a068aad53b524af6615d1dad7003ee5857967 -SIZE (xorg-edit-08.08.06_src.tar.bz2) = 101654 diff --git a/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp b/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp deleted file mode 100644 index a2073a19330d..000000000000 --- a/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp +++ /dev/null @@ -1,54 +0,0 @@ ---- xorgedit/guiframe.cpp.orig -+++ xorgedit/guiframe.cpp -@@ -182,8 +182,13 @@ - otherSectionTab = new wxPanel(layout); // iles/modules/extensions/dri tab panel - wxBoxSizer *otherSectionTabSizer=new wxBoxSizer(wxVERTICAL); - -+#ifdef __clang__ -+ wxString *tempList = new wxString[devListSize+1]; // initial list for combo und choice elements -+ wxString *optList = new wxString[optListSize]; // initial list for option combo und choice elements -+#else - wxString tempList[devListSize+1]; // initial list for combo und choice elements - wxString optList[optListSize]; // initial list for option combo und choice elements -+#endif - - optList[0]=_("----------"); - optList[1]=_("Add Option"); -@@ -821,6 +826,11 @@ - if (ShowError()) return; - } - SetSaved(true); -+ -+#ifdef __clang__ -+ delete[] optList; -+ delete[] tempList; -+#endif - } - - const bool GuiFrame::CreateBackup(void) const -@@ -1832,8 +1842,13 @@ - - warningText->SetLabel(_("Warning: Improper use of this tool can cause damage to your\nxorg.conf and may not start your Xserver.\nYou must restart X to take the changes effect.")); - -+#ifdef __clang__ -+ wxString *tempList = new wxString[devListSize+1]; // initial list for combo und choice elements -+ wxString *optList = new wxString[optListSize]; // initial list for option combo und choice elements -+#else - wxString tempList[devListSize+1]; // initial list for combo und choice elements - wxString optList[optListSize]; // initial list for option combo und choice elements -+#endif - unsigned int offset=0; - unsigned int i; - -@@ -2269,6 +2284,11 @@ - - driBox->SetLabel(_("DRI")); - return(false); -+ -+#ifdef __clang__ -+ delete[] optList; -+ delete[] tempList; -+#endif - } - - void GuiFrame::SetSaved(const bool save) diff --git a/x11/xorg-edit/pkg-descr b/x11/xorg-edit/pkg-descr deleted file mode 100644 index f15a3a1bcf03..000000000000 --- a/x11/xorg-edit/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -GUI to edit XServer-file xorg.conf easily - -WWW: http://www.deesaster.org/progxorg.php