From 68af41d01ec013b4d279b39f62b55e18971d1e9d Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Thu, 13 Nov 2003 07:45:04 +0000 Subject: [PATCH] Clean up Makefile, add more MASTER_SITES, reference new WWW, honour PTHREAD_*, and other such fixes. Reorder plist, and add missing file, thus earning a PORTREVISION bump. These are just general cleanups; new versions of this program exist. --- graphics/kbarcode/Makefile | 20 +++++++++----------- graphics/kbarcode/pkg-descr | 2 +- graphics/kbarcode/pkg-plist | 11 ++++++----- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile index df871d8b9ac7..4f567608e098 100644 --- a/graphics/kbarcode/Makefile +++ b/graphics/kbarcode/Makefile @@ -7,23 +7,21 @@ PORTNAME= kbarcode PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= graphics kde -MASTER_SITES= ftp://ftp.kde.com/pub/Office/Organize_Track/KBarcode/ -DISTNAME= ${PORTNAME}-${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= KBarcode creates, handles, manages and prints barcodes BUILD_DEPENDS= barcode:${PORTSDIR}/graphics/barcode -USE_KDELIBS_VER=3 -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --with-extra-includes=${LOCALBASE}/include - -post-install: - ${STRIP_CMD} ${PREFIX}/bin/kbarcode +USE_KDELIBS_VER= 3 +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .include diff --git a/graphics/kbarcode/pkg-descr b/graphics/kbarcode/pkg-descr index f530bd4cd9d8..b7e302d86c41 100644 --- a/graphics/kbarcode/pkg-descr +++ b/graphics/kbarcode/pkg-descr @@ -16,7 +16,7 @@ KBarcode creates, handles, manages and prints barcodes them using the specified barcode label * a friendly GUI. -WWW: http://kbarcode.sourceforge.net/ +WWW: http://www.kbarcode.net Authors: Dominik Seichter , Stefan "Stonki" Onken Maintainer: Andy Raffle diff --git a/graphics/kbarcode/pkg-plist b/graphics/kbarcode/pkg-plist index a2f5bdb73b64..28a5f3f49405 100644 --- a/graphics/kbarcode/pkg-plist +++ b/graphics/kbarcode/pkg-plist @@ -1,13 +1,14 @@ bin/kbarcode share/applnk/Applications/kbarcode.desktop -share/icons/locolor/32x32/apps/kbarcode.png share/icons/locolor/16x16/apps/kbarcode.png -share/apps/kbarcode/labeldefinitions.sql -share/apps/kbarcode/exampledata.sql +share/icons/locolor/32x32/apps/kbarcode.png share/apps/kbarcode/barcodes.html -share/doc/HTML/en/kbarcode/index.docbook -share/doc/HTML/en/kbarcode/index.cache.bz2 +share/apps/kbarcode/exampledata.sql +share/apps/kbarcode/labeldefinitions.sql +share/apps/kbarcode/logo.png share/doc/HTML/en/kbarcode/common +share/doc/HTML/en/kbarcode/index.cache.bz2 +share/doc/HTML/en/kbarcode/index.docbook @dirrm share/doc/HTML/en/kbarcode @dirrm share/apps/kbarcode @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true