diff options
| -rw-r--r-- | x11-toolkits/gnocl/Makefile | 11 | ||||
| -rw-r--r-- | x11-toolkits/gnocl/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/gnocl/files/patch-src_Makefile | 37 | ||||
| -rw-r--r-- | x11-toolkits/gnocl/files/patch-src_gnocl.c | 11 |
4 files changed, 45 insertions, 18 deletions
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile index ac28b95bbbab..b139172375bd 100644 --- a/x11-toolkits/gnocl/Makefile +++ b/x11-toolkits/gnocl/Makefile @@ -9,13 +9,14 @@ PORTNAME= gnocl DISTVERSION= ${BASE_VERSION}-${NIGHTLY_BUILD} PORTREVISION= 1 CATEGORIES= x11-toolkits devel -MASTER_SITES= SF/${PORTNAME}/Gnocl-Nightly-Build/ +MASTER_SITES= SF/${PORTNAME} MAINTAINER= gahr@FreeBSD.org COMMENT= GTK+ and Gnome extension for Tcl LIB_DEPENDS= canberra.0:${PORTSDIR}/audio/libcanberra \ - notify.4:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify \ + gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview USE_GMAKE= yes USE_BZIP2= yes @@ -24,8 +25,8 @@ USE_TCL= 84+ USE_LDCONFIG= yes CFLAGS+= -I${TCL_INCLUDEDIR} -L${TCL_LIBDIR} `pkg-config --cflags libglade-2.0` -BASE_VERSION= 0.9.95 -NIGHTLY_BUILD= 30-06-11 +BASE_VERSION= 0.9.96 +NIGHTLY_BUILD= 01-01-12 WRKSRC= ${WRKDIR}/${PORTNAME}-${BASE_VERSION} BUILD_WRKSRC= ${WRKSRC}/src @@ -37,7 +38,7 @@ PLIST_FILES= ${BASEDIR}/${PORTNAME}.so \ PLIST_DIRS= ${BASEDIR} post-patch: - ${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|;s|$$(TCL_VERSION)|${TCL_VER:S/.//}|g' ${BUILD_WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|;s|$$(TCL_VERSION)|${TCL_VER:S/.//}|g;/fileFilter/d' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -e 's|\[info library\]|${PREFIX}/lib|; s|tclsh|${TCLSH}|g;' ${BUILD_WRKSRC}/install.tcl .include <bsd.port.mk> diff --git a/x11-toolkits/gnocl/distinfo b/x11-toolkits/gnocl/distinfo index 37381218a306..9252c8552d81 100644 --- a/x11-toolkits/gnocl/distinfo +++ b/x11-toolkits/gnocl/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnocl-0.9.95-30-06-11.tar.bz2) = 98e9bb6ea1a1fdcc1d2161070d2c3e0479e48b042a138fde7d29834c9e953b2f -SIZE (gnocl-0.9.95-30-06-11.tar.bz2) = 1003258 +SHA256 (gnocl-0.9.96-01-01-12.tar.bz2) = a87df3e3af3424682a78b6d920634290146c31ca1597900d833f5753805bebeb +SIZE (gnocl-0.9.96-01-01-12.tar.bz2) = 1035518 diff --git a/x11-toolkits/gnocl/files/patch-src_Makefile b/x11-toolkits/gnocl/files/patch-src_Makefile new file mode 100644 index 000000000000..b6fe1a254251 --- /dev/null +++ b/x11-toolkits/gnocl/files/patch-src_Makefile @@ -0,0 +1,37 @@ +--- src/Makefile.orig 2012-01-01 17:26:17.000000000 +0100 ++++ src/Makefile 2012-01-03 10:39:09.000000000 +0100 +@@ -21,7 +21,7 @@ + -I/usr/include/libglade-2.0 + + LIBS := $(shell pkg-config \ +- --libs gtk+-2.0 libglade-2.0 libnotify libcanberra) \ ++ --libs gtk+-2.0 libglade-2.0 libnotify libcanberra gtkimageview) \ + -ltclstub$(TCL_VERSION) + + GTK_OBJ := \ +@@ -57,7 +57,6 @@ + expander.o \ + fileChooser.o \ + fileChooserButton.o \ +- fileFilter.o \ + fill.o \ + fixed.o \ + fontButton.o \ +@@ -71,6 +70,7 @@ + infoBar.o \ + inputDialog.o \ + image.o \ ++ imageViewer.o \ + itemGroup.o \ + label.o \ + language.o \ +@@ -89,7 +89,9 @@ + pageSetup.o \ + pageSetupDialog.o \ + paned.o \ ++ parseMarkup.o \ + parseOptions.o \ ++ pbar.o \ + pixBuf.o \ + pixBufFilters.o \ + pixMap.o \ diff --git a/x11-toolkits/gnocl/files/patch-src_gnocl.c b/x11-toolkits/gnocl/files/patch-src_gnocl.c deleted file mode 100644 index 6dd2f50b5f82..000000000000 --- a/x11-toolkits/gnocl/files/patch-src_gnocl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gnocl.c.orig 2011-07-18 10:33:09.000000000 +0200 -+++ src/gnocl.c 2011-07-18 10:33:16.000000000 +0200 -@@ -647,7 +647,7 @@ - /* non-gtk widgets */ - { "spinner", gnoclSpinnerCmd }, - { "dial", gnoclDialCmd }, -- { "imageViewer", gnoclImageViewerCmd }, -+// { "imageViewer", gnoclImageViewerCmd }, - - /* gnocl only widget */ - { "splashScreen", gnoclSplashScreenCmd }, |