summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/rio500/Makefile6
-rw-r--r--devel/ORBit/Makefile12
-rw-r--r--devel/ORBit2/Makefile12
-rw-r--r--devel/libole2/Makefile6
-rw-r--r--devel/oaf/Makefile7
-rw-r--r--irc/irssi-devel/Makefile18
-rw-r--r--irc/irssi-devel/files/patch-ad9
-rw-r--r--irc/irssi-devel/files/patch-ag11
-rw-r--r--irc/irssi-devel/pkg-plist13
-rw-r--r--irc/irssi/Makefile18
-rw-r--r--irc/irssi/files/patch-ad9
-rw-r--r--irc/irssi/files/patch-ag11
-rw-r--r--irc/irssi/pkg-plist13
-rw-r--r--japanese/libicq/Makefile6
-rw-r--r--misc/mc/Makefile8
-rw-r--r--misc/xdelta/Makefile9
-rw-r--r--net-im/libicq/Makefile6
-rw-r--r--net/gnet-glib2/Makefile6
-rw-r--r--net/gnet/Makefile6
-rw-r--r--net/gnet2/Makefile6
-rw-r--r--net/libicq/Makefile6
-rw-r--r--net/xferstats/Makefile13
-rw-r--r--x11-toolkits/gtk12/Makefile7
-rw-r--r--x11-toolkits/gtk12/pkg-plist5
-rw-r--r--x11/dgs/Makefile12
25 files changed, 102 insertions, 133 deletions
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index bf9f208a6081..594f6464ae65 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -12,14 +12,10 @@ MASTER_SITES= http://download.sourceforge.net/rio500/
MAINTAINER= k_nishizawa@anet.ne.jp
-LIB_DEPENDS= glib12:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-devicepath='/dev' \
--with-deviceentry='urio0' \
--with-id3support
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
.include <bsd.port.mk>
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 3c68fbddc69d..4cce72445018 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -14,20 +14,16 @@ MASTER_SITE_SUBDIR= stable/sources/ORBit
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFILES= configure libIDL/configure popt/configure
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
CONFIGURE_ARGS= --disable-indent
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
post-install:
@${ECHO} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 3c68fbddc69d..4cce72445018 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -14,20 +14,16 @@ MASTER_SITE_SUBDIR= stable/sources/ORBit
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFILES= configure libIDL/configure popt/configure
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
CONFIGURE_ARGS= --disable-indent
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
post-install:
@${ECHO} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index 8a8a2edc5062..6bdc9b1dfd52 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR= unstable/sources/libole2
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
USE_GMAKE= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
.include <bsd.port.mk>
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index ecd46949ac1f..aa101d9e45df 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -13,15 +13,13 @@ MASTER_SITE_SUBDIR= unstable/sources/oaf
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- ORBit.2:${PORTSDIR}/devel/ORBit \
+LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
popt.0:${PORTSDIR}/devel/popt \
xml.5:${PORTSDIR}/textproc/libxml
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
@@ -29,7 +27,6 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--enable-static --enable-shared \
--disable-more-warnings
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib -lintl"
pre-patch:
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 950bc1c224b1..ef354c958215 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -13,19 +13,19 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-3
MAINTAINER= jim@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
-
CONFIGURE_ARGS= --without-socks --with-textui --with-bot \
--without-servertest
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -lintl"
.include <bsd.port.pre.mk>
@@ -35,8 +35,10 @@ CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --disable-ipv6
.endif
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/irc/irssi-devel/files/patch-ad b/irc/irssi-devel/files/patch-ad
index b097283d3244..ac93ec27b945 100644
--- a/irc/irssi-devel/files/patch-ad
+++ b/irc/irssi-devel/files/patch-ad
@@ -1,14 +1,5 @@
--- configure.orig Sun Jun 4 10:48:10 2000
+++ configure Fri Jun 9 18:03:22 2000
-@@ -4831,7 +4831,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5546,6 +5546,7 @@
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
diff --git a/irc/irssi-devel/files/patch-ag b/irc/irssi-devel/files/patch-ag
new file mode 100644
index 000000000000..33ac9df8cfcc
--- /dev/null
+++ b/irc/irssi-devel/files/patch-ag
@@ -0,0 +1,11 @@
+--- src/perl/irssi-perl.c.orig Sat Sep 9 01:48:00 2000
++++ src/perl/irssi-perl.c Sat Sep 9 01:47:49 2000
+@@ -18,6 +18,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#define PERL_POLLUTE
++
+ #include <EXTERN.h>
+ #ifndef _SEM_SEMUN_UNDEFINED
+ #define HAS_UNION_SEMUN
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index 28466ffeccc0..0c479166b741 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -1,8 +1,18 @@
bin/botti
bin/irssi
+doc/irssi/botnet.txt
+doc/irssi/design.txt
+doc/irssi/formats.txt
+doc/irssi/manual.txt
+doc/irssi/perl.txt
+doc/irssi/signals.txt
+doc/irssi/special_vars.txt
etc/irssi/colorless.theme
etc/irssi/config
etc/irssi/split.theme
+i386-freebsd/auto/Irssi/.packlist
+i386-freebsd/auto/Irssi/Irssi.bs
+i386-freebsd/auto/Irssi/Irssi.so
lib/irssi/plugins/libfe_common_irc_dcc.a
lib/irssi/plugins/libfe_common_irc_dcc.so
lib/irssi/plugins/libfe_common_irc_dcc.so.0
@@ -137,4 +147,7 @@ share/locale/pt_BR/LC_MESSAGES/irssi.mo
@dirrm share/irssi
@dirrm lib/irssi/plugins
@dirrm lib/irssi
+@dirrm i386-freebsd/auto/Irssi
@dirrm etc/irssi
+@dirrm doc/irssi
+@dirrm doc
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 950bc1c224b1..ef354c958215 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -13,19 +13,19 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-3
MAINTAINER= jim@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
-
CONFIGURE_ARGS= --without-socks --with-textui --with-bot \
--without-servertest
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -lintl"
.include <bsd.port.pre.mk>
@@ -35,8 +35,10 @@ CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --disable-ipv6
.endif
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/irc/irssi/files/patch-ad b/irc/irssi/files/patch-ad
index b097283d3244..ac93ec27b945 100644
--- a/irc/irssi/files/patch-ad
+++ b/irc/irssi/files/patch-ad
@@ -1,14 +1,5 @@
--- configure.orig Sun Jun 4 10:48:10 2000
+++ configure Fri Jun 9 18:03:22 2000
-@@ -4831,7 +4831,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -5546,6 +5546,7 @@
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
diff --git a/irc/irssi/files/patch-ag b/irc/irssi/files/patch-ag
new file mode 100644
index 000000000000..33ac9df8cfcc
--- /dev/null
+++ b/irc/irssi/files/patch-ag
@@ -0,0 +1,11 @@
+--- src/perl/irssi-perl.c.orig Sat Sep 9 01:48:00 2000
++++ src/perl/irssi-perl.c Sat Sep 9 01:47:49 2000
+@@ -18,6 +18,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#define PERL_POLLUTE
++
+ #include <EXTERN.h>
+ #ifndef _SEM_SEMUN_UNDEFINED
+ #define HAS_UNION_SEMUN
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 28466ffeccc0..0c479166b741 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,8 +1,18 @@
bin/botti
bin/irssi
+doc/irssi/botnet.txt
+doc/irssi/design.txt
+doc/irssi/formats.txt
+doc/irssi/manual.txt
+doc/irssi/perl.txt
+doc/irssi/signals.txt
+doc/irssi/special_vars.txt
etc/irssi/colorless.theme
etc/irssi/config
etc/irssi/split.theme
+i386-freebsd/auto/Irssi/.packlist
+i386-freebsd/auto/Irssi/Irssi.bs
+i386-freebsd/auto/Irssi/Irssi.so
lib/irssi/plugins/libfe_common_irc_dcc.a
lib/irssi/plugins/libfe_common_irc_dcc.so
lib/irssi/plugins/libfe_common_irc_dcc.so.0
@@ -137,4 +147,7 @@ share/locale/pt_BR/LC_MESSAGES/irssi.mo
@dirrm share/irssi
@dirrm lib/irssi/plugins
@dirrm lib/irssi
+@dirrm i386-freebsd/auto/Irssi
@dirrm etc/irssi
+@dirrm doc/irssi
+@dirrm doc
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index e4a57c84c3bd..f136de9299b2 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -20,12 +20,8 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= flathill@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 92fb1bf307ba..82cd81d00ed6 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/mc
MAINTAINER= reg@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
.if defined(WITH_NCURSES_PORT)
LIB_DEPENDS+= ncurses.4:${PORTSDIR}/devel/ncurses
.elif defined(WITH_SLANG)
@@ -23,9 +22,8 @@ BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
.endif
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
USE_GMAKE= yes
+USE_GLIB= yes
GNU_CONFIGURE= yes
.if defined(WITH_SLANG)
CONFIGURE_ARGS= --with-slang --without-gnome --with-edit
@@ -33,8 +31,6 @@ CONFIGURE_ARGS= --with-slang --without-gnome --with-edit
CONFIGURE_ARGS= --with-ncurses --without-gnome --without-edit
.endif
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- MAKE="gmake" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= midc.1
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index e11a687bfcd7..6d18da3c5927 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -12,16 +12,11 @@ MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/xdelta/
MAINTAINER= c9710216@atlas.newcastle.edu.au
-BUILD_DEPENDS= ${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS=-L${LOCALBASE}/lib \
- GLIB_CONFIG="${GLIB_CONFIG}"
+ LIBS="-L${LOCALBASE}/lib"
MAN1= xdelta.1
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 2baf0fcd31a6..f365c3616b6e 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -14,12 +14,8 @@ MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
.include <bsd.port.mk>
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index b30b57b39b11..d693d3a0917d 100644
--- a/net/gnet-glib2/Makefile
+++ b/net/gnet-glib2/Makefile
@@ -12,12 +12,8 @@ MASTER_SITES= http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
.include <bsd.port.mk>
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index b30b57b39b11..d693d3a0917d 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -12,12 +12,8 @@ MASTER_SITES= http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
.include <bsd.port.mk>
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index b30b57b39b11..d693d3a0917d 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -12,12 +12,8 @@ MASTER_SITES= http://www.eecs.umich.edu/~dhelder/misc/gnet/src/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
.include <bsd.port.mk>
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 2baf0fcd31a6..f365c3616b6e 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -14,12 +14,8 @@ MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
.include <bsd.port.mk>
diff --git a/net/xferstats/Makefile b/net/xferstats/Makefile
index 18aac8b45017..bd75fe82d54c 100644
--- a/net/xferstats/Makefile
+++ b/net/xferstats/Makefile
@@ -13,19 +13,16 @@ MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/support/ \
MAINTAINER= dima@Chg.RU
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
WRKSRC= ${WRKDIR}/xferstats
+
+USE_GLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
MAN8= xferstats.8
do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/xferstats ${PREFIX}/bin
- @ ${INSTALL_MAN} ${WRKSRC}/xferstats.8 ${MAN8PREFIX}/man/man8
- @ ${INSTALL_DATA} ${WRKSRC}/xferstats.cfg ${PREFIX}/etc/xferstats.cfg.sample
+ ${INSTALL_PROGRAM} ${WRKSRC}/xferstats ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/xferstats.8 ${MAN8PREFIX}/man/man8
+ ${INSTALL_DATA} ${WRKSRC}/xferstats.cfg ${PREFIX}/etc/xferstats.cfg.sample
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 40a76791f34c..b5e39e0930be 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -15,20 +15,17 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
-LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \
- intl.1:${PORTSDIR}/devel/gettext
-
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_PERL5= yes
+USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
X_CFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gtk12-config.1
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 2634e25d9710..11e40abe0173 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -220,9 +220,6 @@ share/themes/Default/gtk/gtkrc.zh_TW.Big5
@dirrm share/themes/Default/gtk
@dirrm share/themes/Default
@dirrm share/themes
-@dirrm include/gtk12/gdk
@dirrm include/gtk12/gtk
+@dirrm include/gtk12/gdk
@dirrm include/gtk12
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index d990868aafc6..949bffd51ae4 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -16,18 +16,14 @@ MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.4:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- glib12.3:${PORTSDIR}/devel/glib12
-BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript55
+ tiff.4:${PORTSDIR}/graphics/tiff
+RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript55
-GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config
-
-USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GMAKE= yes
+USE_GLIB= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GLIB_CONFIG=${GLIB_CONFIG}
-MAKE_ENV= INSTALL=${INSTALL}
MAN1= dgs.1 dpsnx.agent.1
MANM= dpsexec makepsres xepsf
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 17:21:55 +0000