diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-08 03:06:47 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-08 03:06:47 +0800 |
| commit | ca820d81abe8d9ef0ed3e6387567d331ff3a72d5 (patch) | |
| tree | cdc900a8c217382d779c0d1629d1b6f3119bd289 /x11 | |
| parent | ddc97ce8f3fca572a3a49d11b6277c7dc94d670d (diff) | |
| download | marcuscom-ports-ca820d81abe8d9ef0ed3e6387567d331ff3a72d5.tar marcuscom-ports-ca820d81abe8d9ef0ed3e6387567d331ff3a72d5.tar.gz marcuscom-ports-ca820d81abe8d9ef0ed3e6387567d331ff3a72d5.tar.bz2 marcuscom-ports-ca820d81abe8d9ef0ed3e6387567d331ff3a72d5.tar.lz marcuscom-ports-ca820d81abe8d9ef0ed3e6387567d331ff3a72d5.tar.xz marcuscom-ports-ca820d81abe8d9ef0ed3e6387567d331ff3a72d5.tar.zst marcuscom-ports-ca820d81abe8d9ef0ed3e6387567d331ff3a72d5.zip | |
- In oldstyle xxConf.sh don't tell programs to link to gtk12 via -lgtk12
but to use -lgtk-12. How was this never a problem before now??
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7621 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libcapplet/Makefile | 4 | ||||
| -rw-r--r-- | x11/libcapplet/files/patch-cappletConf.sh.in | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile index eb23c657d..de677b042 100644 --- a/x11/libcapplet/Makefile +++ b/x11/libcapplet/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Soboleb <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libcapplet/Makefile,v 1.2 2006/09/10 00:51:15 mezz Exp $ +# $MCom: ports/x11/libcapplet/Makefile,v 1.3 2006/10/04 19:37:59 ahze Exp $ PORTNAME= libcapplet PORTVERSION= 1.4.0.5 -PORTREVISION= 5 +PORTREVISION= 7 CATEGORIES= x11 gnome MASTER_SITES= http://people.freebsd.org/~sobomax/ DIST_SUBDIR= gnome diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in index 5638ef5e3..ee73029fd 100644 --- a/x11/libcapplet/files/patch-cappletConf.sh.in +++ b/x11/libcapplet/files/patch-cappletConf.sh.in @@ -1,8 +1,9 @@ ---- cappletConf.sh.in.orig Wed Oct 4 15:36:44 2006 -+++ cappletConf.sh.in Wed Oct 4 15:37:24 2006 +--- cappletConf.sh.in.orig Wed Jul 10 08:42:31 2002 ++++ cappletConf.sh.in Sat Oct 7 15:03:42 2006 @@ -1,4 +1,4 @@ CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib" - CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba" +-CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba" -CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12" ++CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib-12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib-12 -lwrap -lm -lgnorba" +CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12" MODULE_VERSION="capplet-1.4.0.5" |