summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/guitar/Makefile19
-rw-r--r--sysutils/ipsc/Makefile37
-rw-r--r--sysutils/ipsc/pkg-plist1
3 files changed, 24 insertions, 33 deletions
diff --git a/sysutils/guitar/Makefile b/sysutils/guitar/Makefile
index 46c45278a7a4..f0e181c22c7d 100644
--- a/sysutils/guitar/Makefile
+++ b/sysutils/guitar/Makefile
@@ -13,23 +13,22 @@ MASTER_SITES= http://disq.bir.net.tr/guitar/ \
MAINTAINER= domi@saargate.de
-LIB_DEPENDS= gtk12.3:${PORTSDIR}/x11-toolkits/gtk12
-
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_GTK= yes
+WANT_GNOME= yes
GNU_CONFIGURE= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+.include <bsd.port.pre.mk>
-.if defined(NO_GNOME)
-CONFIGURE_ARGS += --disable-gnome
+.if defined(HAVE_GNOME)
+USE_GNOME= yes
.else
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
+CONFIGURE_ARGS+=--disable-gnome
.endif
do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/src/guitar ${PREFIX}/bin
- @ ${INSTALL_SCRIPT} ${SCRIPTDIR}/bsdtar2gnutar ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/guitar ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${SCRIPTDIR}/bsdtar2gnutar ${PREFIX}/bin
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile
index 2fc1a2e8641e..cd8ead0cd169 100644
--- a/sysutils/ipsc/Makefile
+++ b/sysutils/ipsc/Makefile
@@ -9,43 +9,34 @@ PORTNAME= ipsc
PORTVERSION= 0.4.2
CATEGORIES= sysutils gnome
MASTER_SITES= http://ipsc.sourceforge.net/dist/ipsc/
-DISTNAME= ${PKGNAME}-src
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= jeremy@external.org
BUILD_DEPENDS= ${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips/prips.o:${PORTSDIR}/sysutils/prips:build
-.if defined(WITH_GNOME)
-LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-.if defined(WITH_GNOME)
-USE_XLIB= YES
-.endif
WRKSRC= ${WRKDIR}/ipsc/src
-post-extract:
- @${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../prips/work/prips \
- ${WRKDIR}/prips
+WANT_GNOME= yes
-pre-build:
-.if defined(WITH_GNOME)
-PLIST= ${PKGDIR}/PLIST.gnome
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_X_PREFIX= yes
+USE_GNOME= yes
ALL_TARGET= all
.else
ALL_TARGET= ipsc
.endif
-post-build:
-.if defined(WITH_GNOME)
- @${ECHO_MSG} ""
- @${ECHO_MSG} "Don't forget to define WITH_GNOME when installing"
- @${ECHO_MSG} ""
-.endif
+post-extract:
+ @${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../prips/work/prips \
+ ${WRKDIR}/prips
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/ipsc ${PREFIX}/bin
-.if defined(WITH_GNOME)
- @${INSTALL_PROGRAM} ${WRKSRC}/gipsc ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/ipsc ${PREFIX}/bin
+.if defined(HAVE_GNOME)
+ ${INSTALL_PROGRAM} ${WRKSRC}/gipsc ${PREFIX}/bin
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/ipsc/pkg-plist b/sysutils/ipsc/pkg-plist
index c0fc224ade20..5921d23e46cd 100644
--- a/sysutils/ipsc/pkg-plist
+++ b/sysutils/ipsc/pkg-plist
@@ -1 +1,2 @@
bin/ipsc
+%%GNOME:%%bin/gipsc