diff options
| author | adamw <adamw@FreeBSD.org> | 2002-11-29 14:31:28 +0800 |
|---|---|---|
| committer | adamw <adamw@FreeBSD.org> | 2002-11-29 14:31:28 +0800 |
| commit | 8376b26362db8514ec93b6399377b7f9455769e7 (patch) | |
| tree | 4d2960bbb057ae406f4d801f26c596e9077045ef | |
| parent | ff1a40b533b767cf2e242103d2c69597b9eb072c (diff) | |
| download | freebsd-ports-gnome-8376b26362db8514ec93b6399377b7f9455769e7.tar.gz freebsd-ports-gnome-8376b26362db8514ec93b6399377b7f9455769e7.tar.zst freebsd-ports-gnome-8376b26362db8514ec93b6399377b7f9455769e7.zip | |
Update icemc 0.2.2 -> 0.2.3. Although the port now officially uses QT3
instead of QT2, this release is primarily a bugfix to prevent the program
from dumping core and truncating the menu file when saving.
This fix was based upon knowledge gleamed from:
PR: 44318
Submitted by: brian K. White <brian@aljex.ocm>
Approved by: pat, kris
| -rw-r--r-- | misc/icemc/Makefile | 7 | ||||
| -rw-r--r-- | misc/icemc/distinfo | 3 | ||||
| -rw-r--r-- | misc/icemc/files/patch-Makefile | 24 | ||||
| -rw-r--r-- | x11-wm/icemc/Makefile | 7 | ||||
| -rw-r--r-- | x11-wm/icemc/distinfo | 3 | ||||
| -rw-r--r-- | x11-wm/icemc/files/patch-Makefile | 24 |
6 files changed, 32 insertions, 36 deletions
diff --git a/misc/icemc/Makefile b/misc/icemc/Makefile index fc26b4fe08c5..965665d2a43a 100644 --- a/misc/icemc/Makefile +++ b/misc/icemc/Makefile @@ -6,15 +6,10 @@ # PORTNAME= icemc -PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTVERSION= 0.2.3 CATEGORIES= x11-wm MASTER_SITES= http://www.algorithm.at/comp/icemc/ -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= icemc-0.2.2.patch.tar.gz -PATCH_DIST_STRIP= -p1 - MAINTAINER= adamw@FreeBSD.org USE_X_PREFIX= yes diff --git a/misc/icemc/distinfo b/misc/icemc/distinfo index d8ae6cc0b553..3fa283bfc57a 100644 --- a/misc/icemc/distinfo +++ b/misc/icemc/distinfo @@ -1,2 +1 @@ -MD5 (icemc-0.2.2.tar.gz) = 6ba3d647139f7574fa83aaa1b36b5e56 -MD5 (icemc-0.2.2.patch.tar.gz) = ff938b1156a11960ccceb73d49f10a04 +MD5 (icemc-0.2.3.tar.gz) = 6b0d403bfd2f1680e769c432d6670b33 diff --git a/misc/icemc/files/patch-Makefile b/misc/icemc/files/patch-Makefile index d5ec86c30fd5..df04a5f1f515 100644 --- a/misc/icemc/files/patch-Makefile +++ b/misc/icemc/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Tue Dec 4 12:49:24 2001 -+++ Makefile Tue Jan 1 23:26:16 2002 -@@ -13,21 +13,18 @@ +--- Makefile.orig Thu Nov 28 16:11:25 2002 ++++ Makefile Thu Nov 28 16:14:44 2002 +@@ -13,22 +13,22 @@ # QTDIR = /usr/lib/qt # DESTDIR (location for installing) @@ -12,20 +12,24 @@ -CC = gcc -CXX = g++ -CFLAGS = -pipe -DNO_DEBUG --CXXFLAGS= -pipe -DNO_DEBUG +-CXXFLAGS= -pipe -DNO_DEBUG -Wall -ansi -INCPATH = -I$(QTDIR)/include -LINK = g++ -+CFLAGS += -DNO_DEBUG -+CXXFLAGS+= -DNO_DEBUG ++#CC = gcc ++#CXX = g++ ++CFLAGS += -pipe -DNO_DEBUG ++CXXFLAGS+= -pipe -DNO_DEBUG -Wall -ansi +INCPATH = ${QTCPPFLAGS} -+LINK = $(CXX) ++LINK = ${CXX} LFLAGS = - #LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm -LIBS = $(SUBLIBS) -lqt ++LIBS = ${QTCFGLIBS} ${LIBQT} + # you might try this if icemc segfaults when starting up: + #LIBS = $(SUBLIBS) -lqt-mt -MOC = $(QTDIR)/bin/moc -UIC = $(QTDIR)/bin/uic -+LIBS = ${QTCFGLIBS} ${LIBQT} -+UIC = ${X11BASE}/uic ++#MOC = $(QTDIR)/bin/moc ++UIC = ${X11BASE}/bin/uic TAR = tar -cf GZIP = gzip -9f diff --git a/x11-wm/icemc/Makefile b/x11-wm/icemc/Makefile index fc26b4fe08c5..965665d2a43a 100644 --- a/x11-wm/icemc/Makefile +++ b/x11-wm/icemc/Makefile @@ -6,15 +6,10 @@ # PORTNAME= icemc -PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTVERSION= 0.2.3 CATEGORIES= x11-wm MASTER_SITES= http://www.algorithm.at/comp/icemc/ -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= icemc-0.2.2.patch.tar.gz -PATCH_DIST_STRIP= -p1 - MAINTAINER= adamw@FreeBSD.org USE_X_PREFIX= yes diff --git a/x11-wm/icemc/distinfo b/x11-wm/icemc/distinfo index d8ae6cc0b553..3fa283bfc57a 100644 --- a/x11-wm/icemc/distinfo +++ b/x11-wm/icemc/distinfo @@ -1,2 +1 @@ -MD5 (icemc-0.2.2.tar.gz) = 6ba3d647139f7574fa83aaa1b36b5e56 -MD5 (icemc-0.2.2.patch.tar.gz) = ff938b1156a11960ccceb73d49f10a04 +MD5 (icemc-0.2.3.tar.gz) = 6b0d403bfd2f1680e769c432d6670b33 diff --git a/x11-wm/icemc/files/patch-Makefile b/x11-wm/icemc/files/patch-Makefile index d5ec86c30fd5..df04a5f1f515 100644 --- a/x11-wm/icemc/files/patch-Makefile +++ b/x11-wm/icemc/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Tue Dec 4 12:49:24 2001 -+++ Makefile Tue Jan 1 23:26:16 2002 -@@ -13,21 +13,18 @@ +--- Makefile.orig Thu Nov 28 16:11:25 2002 ++++ Makefile Thu Nov 28 16:14:44 2002 +@@ -13,22 +13,22 @@ # QTDIR = /usr/lib/qt # DESTDIR (location for installing) @@ -12,20 +12,24 @@ -CC = gcc -CXX = g++ -CFLAGS = -pipe -DNO_DEBUG --CXXFLAGS= -pipe -DNO_DEBUG +-CXXFLAGS= -pipe -DNO_DEBUG -Wall -ansi -INCPATH = -I$(QTDIR)/include -LINK = g++ -+CFLAGS += -DNO_DEBUG -+CXXFLAGS+= -DNO_DEBUG ++#CC = gcc ++#CXX = g++ ++CFLAGS += -pipe -DNO_DEBUG ++CXXFLAGS+= -pipe -DNO_DEBUG -Wall -ansi +INCPATH = ${QTCPPFLAGS} -+LINK = $(CXX) ++LINK = ${CXX} LFLAGS = - #LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm -LIBS = $(SUBLIBS) -lqt ++LIBS = ${QTCFGLIBS} ${LIBQT} + # you might try this if icemc segfaults when starting up: + #LIBS = $(SUBLIBS) -lqt-mt -MOC = $(QTDIR)/bin/moc -UIC = $(QTDIR)/bin/uic -+LIBS = ${QTCFGLIBS} ${LIBQT} -+UIC = ${X11BASE}/uic ++#MOC = $(QTDIR)/bin/moc ++UIC = ${X11BASE}/bin/uic TAR = tar -cf GZIP = gzip -9f |